From cdb30a6e9bdce198e682af5d35f079ebd3453ccb Mon Sep 17 00:00:00 2001
From: Shailesh <mshaileshr@gmail.com>
Date: Thu, 2 May 2019 11:46:32 +0530
Subject: [PATCH 1/4] Merge branch 'master' of
 /Users/shaileshmishra/Documents/workspace/SDK/JAVA/development/contentstack-java
 with conflicts.

---
 pom.xml | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6e849e4d..332248dc 100644
--- a/pom.xml
+++ b/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,21 +21,12 @@
     </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>
 
 
@@ -43,7 +34,7 @@
         <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>
 

From 54086fb6e4bf1e780a4161defcf0390e40438a4b Mon Sep 17 00:00:00 2001
From: Shailesh <mshaileshr@gmail.com>
Date: Thu, 2 May 2019 12:12:00 +0530
Subject: [PATCH 2/4] pom.xml version updated

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 332248dc..fa4d61a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.contentstack.sdk</groupId>
     <artifactId>java</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>contentstack-java</name>

From 5ef8cedf6aa2c187d4c7c8711a81a361e7c70dc9 Mon Sep 17 00:00:00 2001
From: Shailesh <mshaileshr@gmail.com>
Date: Thu, 2 May 2019 12:16:53 +0530
Subject: [PATCH 3/4] changelog updated

---
 CHANGELOG.md   | 12 +++++++++++-
 pom.properties |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3eea55e1..84408dfe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,16 @@
 
 ## CHANGELOG  
-   
+
+
+## Version 1.3.1
+  ### Date: May-02-2019
+  Change: include reference bug fixed
+  added testcase report for v1.3.1
+
+
+------------------------------------------------
+
+
 ## Version 1.3.0  
   ### Date: Apr-12-2019  
   Change: Added support of below methods in SDK   
diff --git a/pom.properties b/pom.properties
index 9519238b..129241ba 100644
--- a/pom.properties
+++ b/pom.properties
@@ -1,4 +1,4 @@
 # Written manually.
-version=1.2.0
+version=1.3.1
 groupId=com.contentstack.sdk
 artifactId=java

From c1620a643e3dc819b56ca28b60e83ad34addd280 Mon Sep 17 00:00:00 2001
From: Shailesh <mshaileshr@gmail.com>
Date: Thu, 2 May 2019 12:37:03 +0530
Subject: [PATCH 4/4] doc tags updated

---
 pom.xml | 39 +++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index fa4d61a2..52b5b318 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,12 +21,21 @@
     </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>
 
 
@@ -34,7 +43,7 @@
         <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>v@{project.version}</tag>
+        <tag>v1.2.1</tag>
     </scm>
 
     <issueManagement>
@@ -50,14 +59,17 @@
 
 
     <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>
 
 
@@ -67,6 +79,7 @@
 
 
     <dependencies>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -84,6 +97,7 @@
 
     <build>
         <plugins>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -97,10 +111,14 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.9.1</version>
+                <configuration>
+                    <additionalparam>-Xdoclint:none</additionalparam>
+                </configuration>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -137,15 +155,15 @@
             </plugin>
 
             <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.7</version>
-            <extensions>true</extensions>
-            <configuration>
-                <serverId>ossrh</serverId>
-                <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                <autoReleaseAfterClose>true</autoReleaseAfterClose>
-            </configuration>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.7</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <serverId>ossrh</serverId>
+                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                </configuration>
             </plugin>
 
             <plugin>
@@ -159,6 +177,7 @@
                     <goals>deploy</goals>
                 </configuration>
             </plugin>
+
         </plugins>
     </build>