Merge branch 'master' of /Users/shaileshmishra/Documents/workspace/SDK/JAVA/development/contentstack-java with conflicts.

Author: ishaileshmishra

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.contentstack.sdk</groupId>
     <artifactId>java</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>contentstack-java</name>
@@ -21,29 +21,20 @@
     </licenses>
 
     <developers>
-
         <developer>
             <name>Shailesh Mishra</name>
             <email>mshaileshr@gmail.com</email>
             <organization>Contentstack</organization>
             <organizationUrl>https://www.contentstack.com/</organizationUrl>
         </developer>
-
-        <developer>
-            <name>Contentstacksdk</name>
-            <email>mobile@contentstack.com</email>
-            <organization>Contentstack</organization>
-            <organizationUrl>https://www.contentstack.com/</organizationUrl>
-        </developer>
-
     </developers>
 
 
     <scm>
         <url>https://github.com/contentstack/contentstack-java/tree/master</url>
         <connection>scm:git:git://github.com/contentstack/contentstack-java.git</connection>
         <developerConnection>scm:git:ssh://github.com:contentstack/contentstack-java.git</developerConnection>
-        <tag>v1.2.1</tag>
+        <tag>v@{project.version}</tag>
     </scm>
 
     <issueManagement>
@@ -59,17 +50,14 @@
 
 
     <distributionManagement>
-
         <snapshotRepository>
             <id>ossrh</id>
             <url>https://oss.sonatype.org/content/repositories/snapshots</url>
         </snapshotRepository>
-
         <repository>
             <id>ossrh</id>
             <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
-
     </distributionManagement>
 
 
@@ -79,7 +67,6 @@
 
 
     <dependencies>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -97,7 +84,6 @@
 
     <build>
         <plugins>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -111,7 +97,6 @@
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
@@ -174,7 +159,6 @@
                     <goals>deploy</goals>
                 </configuration>
             </plugin>
-
         </plugins>
     </build>