Skip to content

Commit c8986c3

Browse files
Merge pull request #74 from contentstack/feat/CS-37219-azure-eu-and-include-metadata
Feat/cs 37219 azure eu and include metadata
2 parents 51e4261 + 79e8f02 commit c8986c3

19 files changed

+413
-553
lines changed

.github/workflows/maven-publish.yml

+7-8
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,22 @@ on:
55
jobs:
66
publish-maven:
77
runs-on: ubuntu-latest
8+
permissions:
9+
contents: read
10+
packages: write
811
steps:
912
- uses: actions/checkout@v3
1013
- name: Set up Maven Central Repository
1114
uses: actions/setup-java@v3
1215
with:
1316
java-version: '8'
1417
distribution: 'adopt'
15-
server-id: shaileshmishra
16-
server-username: MAVEN_USERNAME
17-
server-password: MAVEN_PASSWORD
18-
gpg-passphrase: GPG_PASSPHRASE
18+
server-id: ossrh
19+
server-username: ${{ secrets.OSSRH_USERNAME }}
20+
server-password: ${{ secrets.OSSRH_TOKEN }}
21+
gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
1922
- name: Publish package
2023
run: mvn --batch-mode deploy
21-
env:
22-
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
23-
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
24-
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
2524
publish-github:
2625
runs-on: ubuntu-latest
2726
steps:

.github/workflows/sca-scan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Source Composition Analysis Scan
22
on:
33
pull_request:
4-
types: [opened, synchronize, reopened]
4+
types: [ opened, synchronize, reopened ]
55
jobs:
66
security:
77
runs-on: ubuntu-latest

.github/workflows/secrets-scan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Secrets Scan
22
on:
33
pull_request:
4-
types: [opened, synchronize, reopened]
4+
types: [ opened, synchronize, reopened ]
55
jobs:
66
security:
77
runs-on: ubuntu-latest

CHANGELOG.md

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# CHANGELOG
22

3+
## v1.12.0
4+
5+
### Date: 25-APR-2023
6+
7+
- Include metadata support for Asset, Entry and Query,
8+
- Region support for Azure-EU added
9+
310
## v1.11.0
411

512
### Date: 09-FEB-2023
@@ -9,14 +16,6 @@
916
- Breaking change: Enums PublishType changed from snake-case to ALL_CAPS
1017
- Basic Improvements
1118

12-
## v1.10.2
13-
14-
### Date: 22-Oct-2022
15-
16-
- LivePreview internal function implementation updated
17-
- Jsoup dependency updated
18-
- Json version updated
19-
2019
## v1.10.1
2120

2221
### Date: 18-June-2022

pom.xml

+8-23
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,36 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.contentstack.sdk</groupId>
77
<artifactId>java</artifactId>
8-
<version>1.11.0-SNAPSHOT</version>
8+
<version>1.12.0-SNAPSHOT</version>
99
<packaging>jar</packaging>
1010
<name>contentstack-java</name>
1111
<description>Java SDK for Contentstack Content Delivery API</description>
1212
<url>https://github.com/contentstack/contentstack-java/</url>
1313

1414

1515
<properties>
16-
<sdk.version.release>1.11.0-SNAPSHOT</sdk.version.release>
1716
<maven.compiler.target>1.8</maven.compiler.target>
1817
<maven.compiler.source>1.8</maven.compiler.source>
1918
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2019
<surefire-report-plugin.version>2.22.0</surefire-report-plugin.version>
2120
<maven-source-plugin.version>2.2.1</maven-source-plugin.version>
2221
<maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
23-
<dotenv-source.version>2.3.1</dotenv-source.version>
24-
<rxjava-source.version>3.1.5</rxjava-source.version>
22+
<dotenv-source.version>2.3.2</dotenv-source.version>
23+
<rxjava-source.version>3.1.6</rxjava-source.version>
2524
<retrofit-source.version>2.9.0</retrofit-source.version>
2625
<converter-gson-source.version>2.9.0</converter-gson-source.version>
2726
<loggin.version>4.10.0</loggin.version>
2827
<jococo-plugin.version>0.8.5</jococo-plugin.version>
29-
<lombok-source.version>1.18.24</lombok-source.version>
30-
<junit-jupiter.version>5.9.1</junit-jupiter.version>
28+
<lombok-source.version>1.18.26</lombok-source.version>
29+
<junit-jupiter.version>5.9.2</junit-jupiter.version>
3130
<junit-jupiter-engine.version>5.8.0-M1</junit-jupiter-engine.version>
32-
<junit-vintage-engine.version>5.9.1</junit-vintage-engine.version>
3331
<gson.version>2.8.8</gson.version>
3432
<json-simple-version>1.1.1</json-simple-version>
3533
<maven-site-plugin.version>3.3</maven-site-plugin.version>
3634
<maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
3735
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
3836
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
39-
<json-version>20220924</json-version>
37+
<json-version>20230227</json-version>
4038
<jacoco-maven-plugin-version>0.8.7</jacoco-maven-plugin-version>
4139
<maven-release-plugin-version>2.5.3</maven-release-plugin-version>
4240
<contentstack-utils-version>1.2.0</contentstack-utils-version>
@@ -160,7 +158,7 @@
160158
<dependency>
161159
<groupId>org.junit.vintage</groupId>
162160
<artifactId>junit-vintage-engine</artifactId>
163-
<version>${junit-vintage-engine.version}</version>
161+
<version>${junit-jupiter.version}</version>
164162
<scope>test</scope>
165163
</dependency>
166164

@@ -198,7 +196,7 @@
198196
</executions>
199197
</plugin>
200198
<!--Generate overview.html file-->
201-
<!-- -overview "/Users/shaileshmishra/Documents/workspace/contentstack/javaspace/contentstack-java/src/main/overview.html" -bottom "<b>Copyright © 2012-2022 Contentstack </b><sup>TM</sup>" -->
199+
<!-- -overview "/Users/shaileshmishra/Documents/workspace/contentstack/javaspace/contentstack-java/src/main/overview.html" -bottom "<b>Copyright © 2012-2023 Contentstack </b><sup>TM</sup>" -->
202200
<plugin>
203201
<groupId>org.apache.maven.plugins</groupId>
204202
<artifactId>maven-javadoc-plugin</artifactId>
@@ -225,23 +223,16 @@
225223
</execution>
226224
</executions>
227225
</plugin>
228-
229226
<plugin>
230227
<groupId>org.apache.maven.plugins</groupId>
231228
<artifactId>maven-site-plugin</artifactId>
232229
<version>3.3</version>
233230
</plugin>
234-
235231
<plugin>
236232
<groupId>org.apache.maven.plugins</groupId>
237233
<artifactId>maven-enforcer-plugin</artifactId>
238234
<version>3.0.0-M2</version>
239235
</plugin>
240-
<!--
241-
Signs all of a project's attached artifacts with GnuPG.
242-
You need to have previously configured the default key.
243-
gpg also needs to be on the search path.
244-
-->
245236
<plugin>
246237
<groupId>org.apache.maven.plugins</groupId>
247238
<artifactId>maven-gpg-plugin</artifactId>
@@ -256,12 +247,6 @@
256247
</execution>
257248
</executions>
258249
</plugin>
259-
<!--
260-
Sometimes when you may need to compile a certain project to a different
261-
version than what you are currently using. The javac can accept such command
262-
using -source and -target. The Compiler Plugin can also be configured to
263-
provide these options during compilation
264-
-->
265250
<plugin>
266251
<groupId>org.apache.maven.plugins</groupId>
267252
<artifactId>maven-compiler-plugin</artifactId>

0 commit comments

Comments
 (0)