Skip to content

Commit d2a692d

Browse files
authored
Merge pull request #89 from contentstack/next
Next
2 parents 89193b7 + 90caaf7 commit d2a692d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+226
-82
lines changed

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
run: mvn jacoco:prepare-agent jacoco:report
2323

2424
- name: Upload Code Coverage Report
25-
uses: actions/upload-artifact@v2
25+
uses: actions/upload-artifact@v3
2626
with:
2727
name: code-coverage-report
2828
path: target/site/jacoco

changelog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## v1.5.0
4+
5+
### Sept 16, 2024
6+
7+
- includeReference method implemented
8+
39
## v1.4.3
410

511
### July 08, 2024

pom.xml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<artifactId>cms</artifactId>
88
<packaging>jar</packaging>
99
<name>contentstack-management-java</name>
10-
<version>1.4.3</version>
10+
<version>1.5.0</version>
1111
<description>Contentstack Java Management SDK for Content Management API, Contentstack is a headless CMS with an
1212
API-first approach
1313
</description>
@@ -54,7 +54,7 @@
5454
<organizationUrl>https://www.contentstack.com/</organizationUrl>
5555
</developer>
5656
<developer>
57-
<name>ishaileshmishra</name>
57+
<name>***REMOVED***</name>
5858
<email>[email protected]</email>
5959
<organization>contentstack</organization>
6060
<organizationUrl>https://www.contentstack.com/</organizationUrl>
@@ -91,11 +91,11 @@
9191
<rxjava-source.version>3.1.8</rxjava-source.version>
9292
<retrofit-source.version>2.10.0</retrofit-source.version>
9393
<converter-gson-version>2.10.0</converter-gson-version>
94-
<logging.version>5.0.0-alpha.12</logging.version>
94+
<okhttp.version>4.12.0</okhttp.version>
9595
<jococo-plugin.version>0.8.7</jococo-plugin.version>
9696
<lombok-source.version>1.18.32</lombok-source.version>
9797
<junit-jupiter.version>5.10.1</junit-jupiter.version>
98-
<junit-jupiter-engine.version>5.8.0-M1</junit-jupiter-engine.version>
98+
<junit-jupiter-engine.version>5.10.1</junit-jupiter-engine.version>
9999
<gson.version>2.10.1</gson.version>
100100
<maven-site-plugin.version>3.3</maven-site-plugin.version>
101101
<maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
@@ -132,9 +132,20 @@
132132
<dependency>
133133
<groupId>com.squareup.okhttp3</groupId>
134134
<artifactId>logging-interceptor</artifactId>
135-
<version>${logging.version}</version>
135+
<version>${okhttp.version}</version>
136136
<scope>compile</scope>
137137
</dependency>
138+
<dependency>
139+
<groupId>com.squareup.okhttp3</groupId>
140+
<artifactId>okhttp</artifactId>
141+
<version>${okhttp.version}</version>
142+
</dependency>
143+
<dependency>
144+
<groupId>com.squareup.okhttp3</groupId>
145+
<artifactId>mockwebserver</artifactId>
146+
<version>${okhttp.version}</version>
147+
<scope>test</scope>
148+
</dependency>
138149
<dependency>
139150
<groupId>org.jetbrains</groupId>
140151
<artifactId>annotations</artifactId>
@@ -253,7 +264,7 @@
253264
</plugin>
254265

255266
<!-- -overview
256-
"/Users/shaileshmishra/Documents/Workspace/contentstack/java/contentstack-management-java/src/main/overview.html"
267+
"***REMOVED***tentstack/java/contentstack-management-java/src/main/overview.html"
257268
-bottom "<b>Copyright © 2012-2022 Contentstack </b><sup>TM</sup>"-->
258269
<plugin>
259270
<groupId>org.apache.maven.plugins</groupId>

src/main/java/com/contentstack/cms/Contentstack.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public class Contentstack {
7979
* <br>
8080
*
8181
* @return User
82-
* @author ishaileshmishra
82+
* @author ***REMOVED***
8383
* @see <a href=
8484
* "https://www.contentstack.com/docs/developers/apis/content-management-api/#users">User
8585
* </a>
@@ -129,7 +129,7 @@ public User user() {
129129
* @param password the password of the user
130130
* @return LoginDetails
131131
* @throws IOException the IOException
132-
* @author ishaileshmishra
132+
* @author ***REMOVED***
133133
* @see <a href=
134134
* "https://www.contentstack.com/docs/developers/apis/content-management-api/#users">User
135135
* </a>
@@ -182,7 +182,7 @@ public Response<LoginDetails> login(String emailId, String password) throws IOEx
182182
* @return LoginDetails
183183
* @throws IOException the io exception
184184
* @throws IOException the IOException
185-
* @author ishaileshmishra
185+
* @author ***REMOVED***
186186
* @see <a
187187
* href=
188188
* "https://www.contentstack.com/docs/developers/apis/content-management-api/#log-in-to-your-account">Login

src/main/java/com/contentstack/cms/core/AuthInterceptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* API implementation, you'll want to pass the auth token as the value for the
2020
* Authorization header.
2121
*
22-
* @author ishaileshmishra
22+
* @author ***REMOVED***
2323
* @since v0.1.0
2424
*/
2525
public class AuthInterceptor implements Interceptor {

src/main/java/com/contentstack/cms/core/BadArgumentException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* an illegal or unsuitable argument
66
* passed to a method.
77
*
8-
* @author ishaileshmishra
8+
* @author ***REMOVED***
99
* @version v0.1.0
1010
* @since 2022-10-20
1111
*/

src/main/java/com/contentstack/cms/core/CMALogger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/**
88
* The Contentstack Logger
99
*
10-
* @author ishaileshmishra
10+
* @author ***REMOVED***
1111
* @version v0.1.0
1212
* @since 2022-10-20
1313
*/

src/main/java/com/contentstack/cms/core/CMARuntimeException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* CMARuntimeException that extends Exception class
55
*
6-
* @author ishaileshmishra
6+
* @author ***REMOVED***
77
* @version v0.1.0
88
* @since 2022-10-20
99
*/

src/main/java/com/contentstack/cms/core/ResponseResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/**
1212
* The Contentstack ResponseResult class that accepts different types of Models
1313
*
14-
* @author ishaileshmishra
14+
* @author ***REMOVED***
1515
* @version v0.1.0
1616
* @since 2022-10-20
1717
*/

src/main/java/com/contentstack/cms/core/RetryCallback.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/**
1010
* The Contentstack RetryCallback
1111
*
12-
* @author ishaileshmishra
12+
* @author ***REMOVED***
1313
* @version v0.1.0
1414
* @since 2022-10-20
1515
*/

0 commit comments

Comments
 (0)