Merge pull request #74 from contentstack/feat/CS-37219-azure-eu-and-i…

…nclude-metadata Feat/cs 37219 azure eu and include metadata
contentstack · Apr 18, 2023 · c8986c3 · c8986c3
2 parents 51e4261 + 79e8f02
commit c8986c3
Show file tree

Hide file tree

Showing 19 changed files with 413 additions and 553 deletions.
diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
@@ -5,23 +5,22 @@ on:
 jobs:
   publish-maven:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
     steps:
       - uses: actions/checkout@v3
       - name: Set up Maven Central Repository
         uses: actions/setup-java@v3
         with:
           java-version: '8'
           distribution: 'adopt'
-          server-id: shaileshmishra
-          server-username: MAVEN_USERNAME
-          server-password: MAVEN_PASSWORD
-          gpg-passphrase: GPG_PASSPHRASE
+          server-id: ossrh
+          server-username: ${{ secrets.OSSRH_USERNAME }}
+          server-password: ${{ secrets.OSSRH_TOKEN }}
+          gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
       - name: Publish package
         run: mvn --batch-mode deploy
-        env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
   publish-github:
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/sca-scan.yml b/.github/workflows/sca-scan.yml
@@ -1,7 +1,7 @@
 name: Source Composition Analysis Scan
 on:
   pull_request:
-    types: [opened, synchronize, reopened]
+    types: [ opened, synchronize, reopened ]
 jobs:
   security:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/secrets-scan.yml b/.github/workflows/secrets-scan.yml
@@ -1,7 +1,7 @@
 name: Secrets Scan
 on:
   pull_request:
-    types: [opened, synchronize, reopened]
+    types: [ opened, synchronize, reopened ]
 jobs:
   security:
     runs-on: ubuntu-latest

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## v1.12.0
+
+### Date: 25-APR-2023
+
+- Include metadata support for Asset, Entry and Query,
+- Region support for Azure-EU added
+
 ## v1.11.0
 
 ### Date: 09-FEB-2023
@@ -9,14 +16,6 @@
 - Breaking change: Enums PublishType changed from snake-case to ALL_CAPS
 - Basic Improvements
 
-## v1.10.2
-
-### Date: 22-Oct-2022
-
-- LivePreview internal function implementation updated
-- Jsoup dependency updated
-- Json version updated
-
 ## v1.10.1
 
 ### Date: 18-June-2022

diff --git a/pom.xml b/pom.xml
@@ -5,38 +5,36 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.contentstack.sdk</groupId>
     <artifactId>java</artifactId>
-    <version>1.11.0-SNAPSHOT</version>
+    <version>1.12.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>contentstack-java</name>
     <description>Java SDK for Contentstack Content Delivery API</description>
     <url>https://github.com/contentstack/contentstack-java/</url>
 
 
     <properties>
-        <sdk.version.release>1.11.0-SNAPSHOT</sdk.version.release>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <surefire-report-plugin.version>2.22.0</surefire-report-plugin.version>
         <maven-source-plugin.version>2.2.1</maven-source-plugin.version>
         <maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
-        <dotenv-source.version>2.3.1</dotenv-source.version>
-        <rxjava-source.version>3.1.5</rxjava-source.version>
+        <dotenv-source.version>2.3.2</dotenv-source.version>
+        <rxjava-source.version>3.1.6</rxjava-source.version>
         <retrofit-source.version>2.9.0</retrofit-source.version>
         <converter-gson-source.version>2.9.0</converter-gson-source.version>
         <loggin.version>4.10.0</loggin.version>
         <jococo-plugin.version>0.8.5</jococo-plugin.version>
-        <lombok-source.version>1.18.24</lombok-source.version>
-        <junit-jupiter.version>5.9.1</junit-jupiter.version>
+        <lombok-source.version>1.18.26</lombok-source.version>
+        <junit-jupiter.version>5.9.2</junit-jupiter.version>
         <junit-jupiter-engine.version>5.8.0-M1</junit-jupiter-engine.version>
-        <junit-vintage-engine.version>5.9.1</junit-vintage-engine.version>
         <gson.version>2.8.8</gson.version>
         <json-simple-version>1.1.1</json-simple-version>
         <maven-site-plugin.version>3.3</maven-site-plugin.version>
         <maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
-        <json-version>20220924</json-version>
+        <json-version>20230227</json-version>
         <jacoco-maven-plugin-version>0.8.7</jacoco-maven-plugin-version>
         <maven-release-plugin-version>2.5.3</maven-release-plugin-version>
         <contentstack-utils-version>1.2.0</contentstack-utils-version>
@@ -160,7 +158,7 @@
         <dependency>
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit-vintage-engine.version}</version>
+            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -198,7 +196,7 @@
                 </executions>
             </plugin>
             <!--Generate overview.html file-->
-            <!-- -overview "/Users/shaileshmishra/Documents/workspace/contentstack/javaspace/contentstack-java/src/main/overview.html" -bottom  "<b>Copyright © 2012-2022 Contentstack </b><sup>TM</sup>" -->
+            <!-- -overview "/Users/shaileshmishra/Documents/workspace/contentstack/javaspace/contentstack-java/src/main/overview.html" -bottom  "<b>Copyright © 2012-2023 Contentstack </b><sup>TM</sup>" -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
@@ -225,23 +223,16 @@
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
                 <version>3.3</version>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
                 <version>3.0.0-M2</version>
             </plugin>
-            <!--
-            Signs all of a project's attached artifacts with GnuPG.
-            You need to have previously configured the default key.
-            gpg also needs to be on the search path.
-            -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
@@ -256,12 +247,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--
-            Sometimes when you may need to compile a certain project to a different
-            version than what you are currently using. The javac can accept such command
-            using -source and -target. The Compiler Plugin can also be configured to
-            provide these options during compilation
-            -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>