Merge branch 'master' into renovate/all

# Conflicts:
#	build.gradle

Author: lojzatran

.github/workflows/cd.yml

@@ -49,16 +49,19 @@ jobs:
           distribution: 'zulu'
       - name: status
         run: echo Build is tagged. Uploading artifact ${{ steps.vars.outputs.tag }} to maven central.
+      - run: scripts/setup-signing-key.sh
+        env:
+          DECRYPTER: ${{ secrets.DECRYPTER }}
+          SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+          PASSPHRASE: ${{ secrets.PASSPHRASE }}
       - name: Publish GitHub Pages
         run: ./gradlew --info -Dbuild.version="${{ steps.vars.outputs.tag }}" mkdocsPublish
       - name: deploy to sonatype and publish to maven central
-        run: ./gradlew setLibraryVersion -Dbuild.version="${{ steps.vars.outputs.tag }}" publishToSonatype closeAndReleaseSonatypeStagingRepository
+        run: ./gradlew -Pversion=$REF_NAME setLibraryVersion -Dbuild.version="${{ steps.vars.outputs.tag }}" clean publishToSonatype closeAndReleaseSonatypeStagingRepository
         env:
-          GITHUB_TAG: ${{ steps.vars.outputs.tag }}
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          PGP_KEY: ${{ secrets.PGP_KEY }}
-          PGP_PASSWORD: ${{ secrets.PGP_PASSWORD }}
+           GITHUB_TAG: ${{ steps.vars.outputs.tag }}
+           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
       - name: Slack notification
         if: success() # only when previous step succeeds
         env:

README.md

@@ -2,7 +2,7 @@
 # commercetools sync java
 [![CI](https://github.com/commercetools/commercetools-sync-java/workflows/CI/badge.svg)](https://github.com/commercetools/commercetools-sync-java/actions?query=workflow%3ACI)
 [![codecov](https://codecov.io/gh/commercetools/commercetools-sync-java/branch/master/graph/badge.svg)](https://codecov.io/gh/commercetools/commercetools-sync-java)
-[![Javadoc](https://javadoc.io/badge2/com.commercetools/commercetools-sync-java/javadoc.svg?label=Javadoc)](https://commercetools.github.io/commercetools-sync-java/v/10.0.5/)
+[![Javadoc](https://javadoc.io/badge2/com.commercetools/commercetools-sync-java/javadoc.svg?label=Javadoc)](https://commercetools.github.io/commercetools-sync-java/v/10.0.6/)
 [![Known Vulnerabilities](https://snyk.io/test/github/commercetools/commercetools-sync-java/4b2e26113d591bda158217c5dc1cf80a88665646/badge.svg)](https://snyk.io/test/github/commercetools/commercetools-sync-java/4b2e26113d591bda158217c5dc1cf80a88665646)
 
 
@@ -60,26 +60,26 @@ Here are the most popular ones:
 <dependency>
   <groupId>com.commercetools</groupId>
   <artifactId>commercetools-sync-java</artifactId>
-  <version>10.0.5</version>
+  <version>10.0.6</version>
 </dependency>
 ````
 
 #### Gradle
 
 ````groovy
-implementation 'com.commercetools:commercetools-sync-java:10.0.5'
+implementation 'com.commercetools:commercetools-sync-java:10.0.6'
 ````
 
 #### SBT 
 
 ````
-libraryDependencies += "com.commercetools" % "commercetools-sync-java" % "10.0.5"
+libraryDependencies += "com.commercetools" % "commercetools-sync-java" % "10.0.6"
 ````
 
 #### Ivy 
 
 ````xml
-<dependency org="com.commercetools" name="commercetools-sync-java" rev="10.0.5"/>
+<dependency org="com.commercetools" name="commercetools-sync-java" rev="10.0.6"/>
 ````
 
 **Note**: To avoid `commercetools JVM SDK` libraries version mismatch between projects.

build.gradle

@@ -1,20 +1,19 @@
 plugins {
-    id 'org.ajoberstar.git-publish' version '4.2.2'
     id 'com.adarshr.test-logger' version '4.0.0'
     id 'org.ajoberstar.grgit' version '5.2.2'
     id "com.github.ben-manes.versions" version '0.51.0'
-    id 'ru.vyarus.mkdocs' version '3.0.0'
+    id 'ru.vyarus.mkdocs' version '4.0.1' apply false
     id "com.github.spotbugs" version "6.0.12"
     id 'com.diffplug.spotless' version '6.25.0'
     id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
 }
 
 ext{
-    commercetoolsJavaSdkV2Version = '17.9.0'
-    mockitoJunitJupiterVersion = '5.11.0'
-    jupiterApiVersion = '5.10.2'
-    assertjVersion = '3.25.3'
-    pmdVersion = '7.0.0'
+    commercetoolsJavaSdkV2Version = '17.28.0'
+    mockitoJunitJupiterVersion = '5.16.1'
+    jupiterApiVersion = '5.11.3'
+    assertjVersion = '3.26.3'
+    pmdVersion = '7.7.0'
     jacocoVersion = '0.8.12'
     caffeineVersion = '3.1.8'
     nexusStagingPluginVersion = '0.22.0'
@@ -36,11 +35,11 @@ apply from: "$rootDir/gradle-scripts/jacoco.gradle"
 apply from: "$rootDir/gradle-scripts/spotbugs.gradle"
 apply from: "$rootDir/gradle-scripts/maven-publish.gradle"
 apply from: "$rootDir/gradle-scripts/nexus-publish.gradle"
-apply from: "$rootDir/gradle-scripts/javadocs-publish.gradle"
 apply from: "$rootDir/gradle-scripts/set-library-version.gradle"
-apply from: "$rootDir/gradle-scripts/execution-order.gradle"
 apply from: "$rootDir/gradle-scripts/mkdocs.gradle"
+apply from: "$rootDir/gradle-scripts/javadocs-publish.gradle"
 apply from: "$rootDir/gradle-scripts/spotless.gradle"
+apply from: "$rootDir/gradle-scripts/execution-order.gradle"
 
 dependencies {
     implementation "com.commercetools.sdk:commercetools-http-client:${commercetoolsJavaSdkV2Version}"

docs/README.md

@@ -2,9 +2,9 @@
 # commercetools sync
 [![CI](https://github.com/commercetools/commercetools-sync-java/workflows/CI/badge.svg)](https://github.com/commercetools/commercetools-sync-java/actions?query=workflow%3ACI)
 [![codecov](https://codecov.io/gh/commercetools/commercetools-sync-java/branch/master/graph/badge.svg)](https://codecov.io/gh/commercetools/commercetools-sync-java)
-[![Benchmarks 10.0.5](https://img.shields.io/badge/Benchmarks-10.0.5-orange.svg)](https://commercetools.github.io/commercetools-sync-java/benchmarks/)
-[![Download from Maven Central](https://img.shields.io/badge/Maven_Central-10.0.5-blue.svg)](https://search.maven.org/artifact/com.commercetools/commercetools-sync-java/10.0.5/jar) 
-[![Javadoc](https://javadoc.io/badge2/com.commercetools/commercetools-sync-java/javadoc.svg?label=Javadoc)](https://commercetools.github.io/commercetools-sync-java/v/10.0.5/)
+[![Benchmarks 10.0.6](https://img.shields.io/badge/Benchmarks-10.0.6-orange.svg)](https://commercetools.github.io/commercetools-sync-java/benchmarks/)
+[![Download from Maven Central](https://img.shields.io/badge/Maven_Central-10.0.6-blue.svg)](https://search.maven.org/artifact/com.commercetools/commercetools-sync-java/10.0.6/jar) 
+[![Javadoc](https://javadoc.io/badge2/com.commercetools/commercetools-sync-java/javadoc.svg?label=Javadoc)](https://commercetools.github.io/commercetools-sync-java/v/10.0.6/)
 [![Known Vulnerabilities](https://snyk.io/test/github/commercetools/commercetools-sync-java/4b2e26113d591bda158217c5dc1cf80a88665646/badge.svg)](https://snyk.io/test/github/commercetools/commercetools-sync-java/4b2e26113d591bda158217c5dc1cf80a88665646)
 
 
@@ -40,18 +40,18 @@ Here are the most popular ones:
 <dependency>
   <groupId>com.commercetools</groupId>
   <artifactId>commercetools-sync-java</artifactId>
-  <version>10.0.5</version>
+  <version>10.0.6</version>
 </dependency>
 ````
 #### Gradle
 ````groovy
-implementation 'com.commercetools:commercetools-sync-java:10.0.5'
+implementation 'com.commercetools:commercetools-sync-java:10.0.6'
 ````
 #### SBT 
 ````
-libraryDependencies += "com.commercetools" % "commercetools-sync-java" % "10.0.5"
+libraryDependencies += "com.commercetools" % "commercetools-sync-java" % "10.0.6"
 ````
 #### Ivy 
 ````xml
-<dependency org="com.commercetools" name="commercetools-sync-java" rev="10.0.5"/>
+<dependency org="com.commercetools" name="commercetools-sync-java" rev="10.0.6"/>
 ````

docs/RELEASE_NOTES.md

@@ -27,6 +27,13 @@
 7. Add Migration guide section which specifies explicitly if there are breaking changes and how to tackle them.
 -->
 
+### 10.0.6 - Mar 20, 2025
+[Commits](https://github.com/commercetools/commercetools-sync-java/compare/10.0.5...10.0.6) |
+[Javadoc](https://commercetools.github.io/commercetools-sync-java/v/10.0.6/) |
+[Jar](https://search.maven.org/artifact/com.commercetools/commercetools-sync-java/10.0.6/jar)
+- 🐞 **Bug Fixes** (1)
+  - Fix product attributes being updated even though they did not change (https://github.com/commercetools/commercetools-sync-java/issues/1200)
+
 ### 10.0.5 - Feb 8, 2024
 [Commits](https://github.com/commercetools/commercetools-sync-java/compare/10.0.4...10.0.5) |
 [Javadoc](https://commercetools.github.io/commercetools-sync-java/v/10.0.5/) |

gradle-scripts/maven-publish.gradle

@@ -40,9 +40,7 @@ publishing {
 }
 
 signing {
-    def signingKey = System.getenv("PGP_KEY")
-    def signingPassword = System.getenv("PGP_PASSWORD")
-    useInMemoryPgpKeys(signingKey, signingPassword)
+    useGpgCmd()
     sign publishing.publications.mavenJava
 }
 

gradle-scripts/mkdocs.gradle

@@ -1,3 +1,5 @@
+apply plugin: 'ru.vyarus.mkdocs'
+
 mkdocs {
     // mkdocs sources
     sourcesDir = '.' // default is 'docs' in the root directory.

scripts/setup-signing-key.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+set -e
+
+# Decrypt credentials
+echo 'Decode decrypter'
+echo ${DECRYPTER} | base64 --decode > decrypter.json
+echo 'Decode signing key'
+echo ${SIGNING_KEY} | base64 --decode > signing_key.enc
+echo 'Decode passphrase'
+echo ${PASSPHRASE} | base64 --decode > signing_passphrase.enc
+
+gcloud auth activate-service-account --key-file decrypter.json
+
+echo "Decrypt signing secrets"
+
+echo "passphrase"
+gcloud kms decrypt \
+  --project=commercetools-platform \
+  --location=global \
+  --keyring=devtooling \
+  --key=java-sdk-v2 \
+  --ciphertext-file=signing_passphrase.enc \
+  --plaintext-file=signing_passphrase.txt
+
+echo "key"
+gcloud kms decrypt \
+  --project=commercetools-platform \
+  --location=global \
+  --keyring=devtooling \
+  --key=java-sdk-v2 \
+  --ciphertext-file=signing_key.enc \
+  --plaintext-file=signing_key.asc
+
+
+# Import the GPG key
+set +e
+echo "Importing the signing key"
+gpg --import --no-tty --batch --yes signing_key.asc
+echo " - done"
+set -e
+
+# List available GPG keys
+gpg -K
+
+KEYNAME=`gpg --with-colons --keyid-format long --list-keys [email protected] | grep fpr | cut -d ':' -f 10`
+
+mkdir -p ~/.gradle
+touch ~/.gradle/gradle.properties
+
+echo "signing.gnupg.executable=gpg" >> ~/.gradle/gradle.properties
+echo "signing.gnupg.keyName=$KEYNAME" >> ~/.gradle/gradle.properties
+echo "signing.gnupg.passphrase=$(<signing_passphrase.txt)" >> ~/.gradle/gradle.properties
+
+rm -rf signing_passphrase.txt signing_passphrase.enc signing_key.enc decrypter.json signing_key.asc
+