Merge branch 'main' into gen-sdk-updates

commercetools · Nov 3, 2022 · d68dd67 · d68dd67
2 parents b22d1d8 + eb7538d
commit d68dd67
Show file tree

Hide file tree

Showing 42 changed files with 764 additions and 214 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -68,6 +68,10 @@ jobs:
         env:
           SOURCE_TAG: ${{ steps.branch_name.outputs.SOURCE_TAG }}
 
+      - name: "remove API reference commit SHA"
+        run: rm -rf reference.txt
+        continue-on-error: true
+
       - run: ./gradlew writeVersionToExamples
 
       - uses: stefanzweifel/git-auto-commit-action@v4

diff --git a/allowed-licenses.json b/allowed-licenses.json
@@ -10,6 +10,10 @@
             "moduleLicense": "CDDL + GPLv2 with classpath exception",
             "moduleName": "javax.annotation:javax.annotation-api"
         },
+        {
+            "moduleLicense": null,
+            "moduleName": "com.squareup.okio:okio"
+        },
         {
             "moduleLicense": "GNU GENERAL PUBLIC LICENSE, Version 2 + Classpath Exception",
             "moduleName": "javax.annotation:javax.annotation-api"

diff --git a/build.gradle b/build.gradle
@@ -12,23 +12,23 @@ plugins {
     id 'java'
     id 'java-library' // needed to make sure that transitive deps have 'compile' scope
 
-    id "com.diffplug.spotless" version "6.1.2"
+    id "com.diffplug.spotless" version "6.10.0"
 
     id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
     id 'com.github.jk1.dependency-license-report' version '2.0'
 
-    id "me.champeau.jmh" version "0.6.6"
+    id "me.champeau.jmh" version "0.6.8"
 }
 
 configurations {
     taglet {
-        resolutionStrategy.force("net.sourceforge.plantuml:plantuml:1.2022.0")
+        resolutionStrategy.force("net.sourceforge.plantuml:plantuml:1.2022.12")
     }
 }
 
 dependencies {
     taglet 'com.commercetools.build.taglets:commercetools-taglets:2.1.4'
-    taglet 'org.jdrupes.taglets:plantuml-taglet:2.0.0'
+    taglet 'org.jdrupes.taglets:plantuml-taglet:2.0.1'
 }
 
 import java.text.SimpleDateFormat

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -1,12 +1,12 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version "1.6.10"
+    id 'org.jetbrains.kotlin.jvm' version "1.7.20"
 }
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    implementation "com.github.javaparser:javaparser-symbol-solver-core:3.24.0"
-    implementation "com.google.code.gson:gson:2.8.9"
+    implementation "com.github.javaparser:javaparser-symbol-solver-core:3.24.7"
+    implementation "com.google.code.gson:gson:2.10"
 }
diff --git a/commercetools/commercetools-apachehttp-client/build.gradle b/commercetools/commercetools-apachehttp-client/build.gradle
@@ -1,13 +1,12 @@
 
 dependencies {
     api project(":rmf:rmf-java-base")
-    api("org.apache.httpcomponents.client5:httpclient5") {
-        version {
-            strictly "[5.0,6.0["
-            prefer "5.1"
-        }
+    api "org.apache.httpcomponents.client5:httpclient5:5.1.3" version {
+        strictly "[5.0,6.0["
+        prefer "5.1.3"
     }
-    api "commons-io:commons-io" version commons.io
 
-    implementation "javax.validation:validation-api:${versions.validation}"
+    api commons.io version commons.io_version
+
+    implementation javax.validation
 }
diff --git a/commercetools/commercetools-async-http-client/build.gradle b/commercetools/commercetools-async-http-client/build.gradle
@@ -2,7 +2,7 @@
 dependencies {
     api project(":rmf:rmf-java-base")
     api "org.asynchttpclient:async-http-client:2.12.3"
-    api "commons-io:commons-io" version commons.io
+    api commons.io version commons.io_version
 
-    implementation "javax.validation:validation-api:${versions.validation}"
+    implementation javax.validation
 }
diff --git a/commercetools/commercetools-okhttp-client3/build.gradle b/commercetools/commercetools-okhttp-client3/build.gradle
@@ -1,12 +1,10 @@
 
 dependencies {
     api project(":rmf:rmf-java-base")
-    api("com.squareup.okhttp3:okhttp") {
-        version {
-            strictly "[3.0,4.0["
-            prefer "3.14.9"
-        }
+    api "com.squareup.okhttp3:okhttp:3.14.9" version {
+        strictly "[3.0,4.0["
+        prefer "3.14.9"
     }
 
-    implementation "javax.validation:validation-api:${versions.validation}"
+    implementation javax.validation
 }
diff --git a/commercetools/commercetools-okhttp-client4/build.gradle b/commercetools/commercetools-okhttp-client4/build.gradle
@@ -1,13 +1,11 @@
 
 dependencies {
     api project(":rmf:rmf-java-base")
-    api("com.squareup.okhttp3:okhttp") {
-        version {
-            strictly '[4.0,5.0['
-            prefer "4.9.1"
-        }
+    api "com.squareup.okhttp3:okhttp:4.10.0" version {
+        strictly '[4.0,5.0['
+        prefer "4.10.0"
     }
+    implementation "com.squareup.okio:okio:3.2.0"
 
-    implementation "javax.validation:validation-api:${versions.validation}"
-
+    implementation javax.validation
 }
diff --git a/commercetools/commercetools-sdk-compat-v1/build.gradle b/commercetools/commercetools-sdk-compat-v1/build.gradle
@@ -10,23 +10,23 @@ jmh {
 dependencies {
 
     api project(':rmf:rmf-java-base')
-    api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
-    api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
-    implementation "com.google.code.findbugs:jsr305:${versions.findbugs}"
-    implementation "javax.validation:validation-api:${versions.validation}"
-    api "org.slf4j:slf4j-api:${versions.slf4j}"
+    api jackson_core.annotations
+    api jackson_core.databind
+    implementation google.findbugs
+    implementation javax.validation
+    api slf4j.api
     api commons.lang3
 
     api project(':commercetools:commercetools-sdk-java-api')
-    api "com.commercetools.sdk.jvm.core:commercetools-java-client-core" version versions.ctpJvmSdk
-    api "com.commercetools.sdk.jvm.core:commercetools-models" version versions.ctpJvmSdk
+    api ctsdkv1.client version ctsdkv1.version
+    api ctsdkv1.models version ctsdkv1.version
 
     jmhImplementation project(':commercetools:commercetools-async-http-client')
     jmhImplementation project(':commercetools:commercetools-apachehttp-client')
     testImplementation project(':commercetools:commercetools-http-client')
-    testImplementation "com.commercetools.sdk.jvm.core:commercetools-models" version versions.ctpJvmSdk
-    testImplementation "com.commercetools.sdk.jvm.core:commercetools-convenience" version versions.ctpJvmSdk
-    testImplementation "com.commercetools.sdk.jvm.core:commercetools-java-client" version versions.ctpJvmSdk
+    testImplementation ctsdkv1.client version ctsdkv1.version
+    testImplementation ctsdkv1.models version ctsdkv1.version
+    testImplementation ctsdkv1.convenience version ctsdkv1.version
 }
 
 sourceSets.main.java.srcDirs += "src/main/java-generated"
diff --git a/...k-compat-v1/src/integrationTest/java/com/commercetools/compat/CommercetoolsTestUtils.java b/...k-compat-v1/src/integrationTest/java/com/commercetools/compat/CommercetoolsTestUtils.java
@@ -4,6 +4,7 @@
 import java.util.UUID;
 
 import com.commercetools.api.client.ByProjectKeyRequestBuilder;
+import com.commercetools.api.client.ProjectApiRoot;
 import com.commercetools.api.defaultconfig.ApiRootBuilder;
 import com.commercetools.api.defaultconfig.ServiceRegion;
 import com.commercetools.api.models.common.LocalizedString;
@@ -15,7 +16,7 @@
 public class CommercetoolsTestUtils {
 
     private static final ApiHttpClient client;
-    private static final ByProjectKeyRequestBuilder projectRoot;
+    private static final ProjectApiRoot projectRoot;
 
     static {
         String logLevel = System.getenv("CTP_JVM_SDK_LOG_LEVEL");
@@ -24,7 +25,7 @@ public class CommercetoolsTestUtils {
                     ClientCredentials.of().withClientId(getClientId()).withClientSecret(getClientSecret()).build(),
                     ServiceRegion.GCP_EUROPE_WEST1);
         client = builder.buildClient();
-        projectRoot = ApiRootBuilder.createForProject(getProjectKey(), client);
+        projectRoot = builder.build(getProjectKey());
     }
 
     public static String randomString() {
@@ -57,7 +58,7 @@ public static String getClientSecret() {
         return System.getenv("CTP_CLIENT_SECRET");
     }
 
-    public static ByProjectKeyRequestBuilder getProjectRoot() {
+    public static ProjectApiRoot getProjectRoot() {
         return projectRoot;
     }
 

diff --git a/...ols-sdk-compat-v1/src/integrationTest/java/com/commercetools/compat/CompatClientTest.java b/...ols-sdk-compat-v1/src/integrationTest/java/com/commercetools/compat/CompatClientTest.java
@@ -2,6 +2,8 @@
 package com.commercetools.compat;
 
 import com.commercetools.api.client.ApiRoot;
+import com.commercetools.api.client.ByProjectKeyCartsGet;
+import com.commercetools.api.client.ProjectApiRoot;
 import com.commercetools.api.defaultconfig.ApiRootBuilder;
 import com.commercetools.api.models.cart.Cart;
 import com.commercetools.api.models.category.CategoryPagedQueryResponse;
@@ -94,4 +96,11 @@ public void compatClientWithApiRootCategories() {
                 .getBody();
         Assertions.assertThat(response).isInstanceOf(CategoryPagedQueryResponse.class);
     }
+
+    public void compatBuilder() {
+        ProjectApiRoot root = CommercetoolsTestUtils.getProjectRoot();
+        ByProjectKeyCartsGet cartRequest = CompatBuilder.of(root)
+                .query()
+                .cart(cartQuery -> cartQuery.plusPredicates(cartQueryModel -> cartQueryModel.anonymousId().is("42")));
+    }
 }