From 0939d127ee9118c1493aa008c24466e549e552da Mon Sep 17 00:00:00 2001 From: Jens Schulze Date: Fri, 20 Dec 2024 08:55:58 +0100 Subject: [PATCH 1/7] add HttpClient info to UserAgent --- .../ApacheHttpClientSolutionInfo.java | 4 ++- .../http/apachehttp/SolutionInfoTest.java | 14 ++++++++ .../AsyncHttpClientSolutionInfo.java | 14 ++++++++ .../io.vrap.rmf.base.client.SolutionInfo | 1 + .../asynchttpclient/SolutionInfoTest.java | 16 +++++++++ .../JavaNetHttpClientSolutionInfo.java | 14 ++++++++ .../io.vrap.rmf.base.client.SolutionInfo | 1 + .../http/javanet/SolutionInfoTest.java | 14 ++++++++ .../okhttp3/OkHttpClientSolutionInfo.java | 14 ++++++++ .../io.vrap.rmf.base.client.SolutionInfo | 1 + .../http/okhttp3/SolutionInfoTest.java | 14 ++++++++ .../okhttp4/OkHttpClientSolutionInfo.java | 14 ++++++++ .../io.vrap.rmf.base.client.SolutionInfo | 1 + .../http/okhttp4/SolutionInfoTest.java | 14 ++++++++ .../netty/NettyHttpClientSolutionInfo.java | 14 ++++++++ .../io.vrap.rmf.base.client.SolutionInfo | 1 + .../http/netty/SolutionInfoTest.java | 14 ++++++++ .../vrap/rmf/base/client/UserAgentUtils.java | 5 ++- .../vrap/rmf/base/client/VersionLoader.java | 33 +++++++++++++++++++ 19 files changed, 201 insertions(+), 2 deletions(-) create mode 100644 commercetools/commercetools-apachehttp-client/src/test/java/com/commercetools/http/apachehttp/SolutionInfoTest.java create mode 100644 commercetools/commercetools-async-http-client/src/main/java/com/commercetools/http/asynchttp/AsyncHttpClientSolutionInfo.java create mode 100644 commercetools/commercetools-async-http-client/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo create mode 100644 commercetools/commercetools-async-http-client/src/test/java/com/commercetools/http/asynchttpclient/SolutionInfoTest.java create mode 100644 commercetools/commercetools-javanet-client/src/main/java/com/commercetools/http/javanet/JavaNetHttpClientSolutionInfo.java create mode 100644 commercetools/commercetools-javanet-client/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo create mode 100644 commercetools/commercetools-javanet-client/src/test/java/com/commercetools/http/javanet/SolutionInfoTest.java create mode 100644 commercetools/commercetools-okhttp-client3/src/main/java/com/commercetools/http/okhttp3/OkHttpClientSolutionInfo.java create mode 100644 commercetools/commercetools-okhttp-client3/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo create mode 100644 commercetools/commercetools-okhttp-client3/src/test/java/com/commercetools/http/okhttp3/SolutionInfoTest.java create mode 100644 commercetools/commercetools-okhttp-client4/src/main/java/com/commercetools/http/okhttp4/OkHttpClientSolutionInfo.java create mode 100644 commercetools/commercetools-okhttp-client4/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo create mode 100644 commercetools/commercetools-okhttp-client4/src/test/java/com/commercetools/http/okhttp4/SolutionInfoTest.java create mode 100644 commercetools/commercetools-reactornetty-client/src/main/java/com/commercetools/http/netty/NettyHttpClientSolutionInfo.java create mode 100644 commercetools/commercetools-reactornetty-client/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo create mode 100644 commercetools/commercetools-reactornetty-client/src/test/java/com/commercetools/http/netty/SolutionInfoTest.java create mode 100644 rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/VersionLoader.java diff --git a/commercetools/commercetools-apachehttp-client/src/main/java/com/commercetools/http/apachehttp/ApacheHttpClientSolutionInfo.java b/commercetools/commercetools-apachehttp-client/src/main/java/com/commercetools/http/apachehttp/ApacheHttpClientSolutionInfo.java index 00bcba8987f..3490d37c19c 100644 --- a/commercetools/commercetools-apachehttp-client/src/main/java/com/commercetools/http/apachehttp/ApacheHttpClientSolutionInfo.java +++ b/commercetools/commercetools-apachehttp-client/src/main/java/com/commercetools/http/apachehttp/ApacheHttpClientSolutionInfo.java @@ -1,10 +1,12 @@ package com.commercetools.http.apachehttp; +import io.vrap.rmf.base.client.SolutionInfo; + import org.apache.hc.client5.http.classic.HttpClient; import org.apache.hc.core5.util.VersionInfo; -public class ApacheHttpClientSolutionInfo extends io.vrap.rmf.base.client.SolutionInfo { +public class ApacheHttpClientSolutionInfo extends SolutionInfo { public ApacheHttpClientSolutionInfo() { setName("ApacheHttpAsyncClient"); setVersion( diff --git a/commercetools/commercetools-apachehttp-client/src/test/java/com/commercetools/http/apachehttp/SolutionInfoTest.java b/commercetools/commercetools-apachehttp-client/src/test/java/com/commercetools/http/apachehttp/SolutionInfoTest.java new file mode 100644 index 00000000000..2edc0b515c0 --- /dev/null +++ b/commercetools/commercetools-apachehttp-client/src/test/java/com/commercetools/http/apachehttp/SolutionInfoTest.java @@ -0,0 +1,14 @@ + +package com.commercetools.http.apachehttp; + +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; + +public class SolutionInfoTest { + @Test + public void version() { + String version = new ApacheHttpClientSolutionInfo().getVersion(); + + Assertions.assertThat(version).isEqualTo("5.4.1"); + } +} diff --git a/commercetools/commercetools-async-http-client/src/main/java/com/commercetools/http/asynchttp/AsyncHttpClientSolutionInfo.java b/commercetools/commercetools-async-http-client/src/main/java/com/commercetools/http/asynchttp/AsyncHttpClientSolutionInfo.java new file mode 100644 index 00000000000..ceaa22852e3 --- /dev/null +++ b/commercetools/commercetools-async-http-client/src/main/java/com/commercetools/http/asynchttp/AsyncHttpClientSolutionInfo.java @@ -0,0 +1,14 @@ + +package com.commercetools.http.asynchttp; + +import io.vrap.rmf.base.client.SolutionInfo; +import io.vrap.rmf.base.client.VersionLoader; + +public class AsyncHttpClientSolutionInfo extends SolutionInfo { + + public AsyncHttpClientSolutionInfo() { + setName("AsyncHttpAsyncClient"); + setVersion(VersionLoader.loadVersionInfo("org.asynchttpclient", "async-http-client", "pom.properties", + "version", this.getClass().getClassLoader())); + } +} diff --git a/commercetools/commercetools-async-http-client/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo b/commercetools/commercetools-async-http-client/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo new file mode 100644 index 00000000000..97eeac311ab --- /dev/null +++ b/commercetools/commercetools-async-http-client/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo @@ -0,0 +1 @@ +com.commercetools.http.asynchttp.AsyncHttpClientSolutionInfo diff --git a/commercetools/commercetools-async-http-client/src/test/java/com/commercetools/http/asynchttpclient/SolutionInfoTest.java b/commercetools/commercetools-async-http-client/src/test/java/com/commercetools/http/asynchttpclient/SolutionInfoTest.java new file mode 100644 index 00000000000..ca4046fa09f --- /dev/null +++ b/commercetools/commercetools-async-http-client/src/test/java/com/commercetools/http/asynchttpclient/SolutionInfoTest.java @@ -0,0 +1,16 @@ + +package com.commercetools.http.asynchttpclient; + +import com.commercetools.http.asynchttp.AsyncHttpClientSolutionInfo; + +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; + +public class SolutionInfoTest { + @Test + public void version() { + String version = new AsyncHttpClientSolutionInfo().getVersion(); + + Assertions.assertThat(version).isEqualTo("2.12.3"); + } +} diff --git a/commercetools/commercetools-javanet-client/src/main/java/com/commercetools/http/javanet/JavaNetHttpClientSolutionInfo.java b/commercetools/commercetools-javanet-client/src/main/java/com/commercetools/http/javanet/JavaNetHttpClientSolutionInfo.java new file mode 100644 index 00000000000..a1486b802eb --- /dev/null +++ b/commercetools/commercetools-javanet-client/src/main/java/com/commercetools/http/javanet/JavaNetHttpClientSolutionInfo.java @@ -0,0 +1,14 @@ + +package com.commercetools.http.javanet; + +import io.vrap.rmf.base.client.SolutionInfo; + +import org.apache.commons.lang3.SystemUtils; + +public class JavaNetHttpClientSolutionInfo extends SolutionInfo { + + public JavaNetHttpClientSolutionInfo() { + setName("JavaNetHttpClient"); + setVersion(SystemUtils.JAVA_RUNTIME_VERSION); + } +} diff --git a/commercetools/commercetools-javanet-client/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo b/commercetools/commercetools-javanet-client/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo new file mode 100644 index 00000000000..56e446e8ac2 --- /dev/null +++ b/commercetools/commercetools-javanet-client/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo @@ -0,0 +1 @@ +com.commercetools.http.javanet.JavaNetHttpClientSolutionInfo diff --git a/commercetools/commercetools-javanet-client/src/test/java/com/commercetools/http/javanet/SolutionInfoTest.java b/commercetools/commercetools-javanet-client/src/test/java/com/commercetools/http/javanet/SolutionInfoTest.java new file mode 100644 index 00000000000..43fb10b9317 --- /dev/null +++ b/commercetools/commercetools-javanet-client/src/test/java/com/commercetools/http/javanet/SolutionInfoTest.java @@ -0,0 +1,14 @@ + +package com.commercetools.http.javanet; + +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; + +public class SolutionInfoTest { + @Test + public void version() { + String version = new JavaNetHttpClientSolutionInfo().getVersion(); + + Assertions.assertThat(version).isNotEmpty(); + } +} diff --git a/commercetools/commercetools-okhttp-client3/src/main/java/com/commercetools/http/okhttp3/OkHttpClientSolutionInfo.java b/commercetools/commercetools-okhttp-client3/src/main/java/com/commercetools/http/okhttp3/OkHttpClientSolutionInfo.java new file mode 100644 index 00000000000..ae9d4f5fc80 --- /dev/null +++ b/commercetools/commercetools-okhttp-client3/src/main/java/com/commercetools/http/okhttp3/OkHttpClientSolutionInfo.java @@ -0,0 +1,14 @@ + +package com.commercetools.http.okhttp3; + +import io.vrap.rmf.base.client.SolutionInfo; +import io.vrap.rmf.base.client.VersionLoader; + +public class OkHttpClientSolutionInfo extends SolutionInfo { + + public OkHttpClientSolutionInfo() { + setName("OkHttpClient"); + setVersion(VersionLoader.loadVersionInfo("com.squareup.okhttp3", "okhttp", "pom.properties", "version", + this.getClass().getClassLoader())); + } +} diff --git a/commercetools/commercetools-okhttp-client3/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo b/commercetools/commercetools-okhttp-client3/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo new file mode 100644 index 00000000000..a801f94812d --- /dev/null +++ b/commercetools/commercetools-okhttp-client3/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo @@ -0,0 +1 @@ +com.commercetools.http.okhttp3.OkHttpClientSolutionInfo diff --git a/commercetools/commercetools-okhttp-client3/src/test/java/com/commercetools/http/okhttp3/SolutionInfoTest.java b/commercetools/commercetools-okhttp-client3/src/test/java/com/commercetools/http/okhttp3/SolutionInfoTest.java new file mode 100644 index 00000000000..30c274fa731 --- /dev/null +++ b/commercetools/commercetools-okhttp-client3/src/test/java/com/commercetools/http/okhttp3/SolutionInfoTest.java @@ -0,0 +1,14 @@ + +package com.commercetools.http.okhttp3; + +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; + +public class SolutionInfoTest { + @Test + public void version() { + String version = new OkHttpClientSolutionInfo().getVersion(); + + Assertions.assertThat(version).isEqualTo("3.14.9"); + } +} diff --git a/commercetools/commercetools-okhttp-client4/src/main/java/com/commercetools/http/okhttp4/OkHttpClientSolutionInfo.java b/commercetools/commercetools-okhttp-client4/src/main/java/com/commercetools/http/okhttp4/OkHttpClientSolutionInfo.java new file mode 100644 index 00000000000..9222279fc28 --- /dev/null +++ b/commercetools/commercetools-okhttp-client4/src/main/java/com/commercetools/http/okhttp4/OkHttpClientSolutionInfo.java @@ -0,0 +1,14 @@ + +package com.commercetools.http.okhttp4; + +import io.vrap.rmf.base.client.SolutionInfo; + +import okhttp3.OkHttp; + +public class OkHttpClientSolutionInfo extends SolutionInfo { + + public OkHttpClientSolutionInfo() { + setName("OkHttpClient"); + setVersion(OkHttp.VERSION); + } +} diff --git a/commercetools/commercetools-okhttp-client4/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo b/commercetools/commercetools-okhttp-client4/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo new file mode 100644 index 00000000000..63d60f0e3e1 --- /dev/null +++ b/commercetools/commercetools-okhttp-client4/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo @@ -0,0 +1 @@ +com.commercetools.http.okhttp4.OkHttpClientSolutionInfo diff --git a/commercetools/commercetools-okhttp-client4/src/test/java/com/commercetools/http/okhttp4/SolutionInfoTest.java b/commercetools/commercetools-okhttp-client4/src/test/java/com/commercetools/http/okhttp4/SolutionInfoTest.java new file mode 100644 index 00000000000..71ab1fa7bda --- /dev/null +++ b/commercetools/commercetools-okhttp-client4/src/test/java/com/commercetools/http/okhttp4/SolutionInfoTest.java @@ -0,0 +1,14 @@ + +package com.commercetools.http.okhttp4; + +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; + +public class SolutionInfoTest { + @Test + public void version() { + String version = new OkHttpClientSolutionInfo().getVersion(); + + Assertions.assertThat(version).isEqualTo("3.14.9"); + } +} diff --git a/commercetools/commercetools-reactornetty-client/src/main/java/com/commercetools/http/netty/NettyHttpClientSolutionInfo.java b/commercetools/commercetools-reactornetty-client/src/main/java/com/commercetools/http/netty/NettyHttpClientSolutionInfo.java new file mode 100644 index 00000000000..d91eb8ae3b6 --- /dev/null +++ b/commercetools/commercetools-reactornetty-client/src/main/java/com/commercetools/http/netty/NettyHttpClientSolutionInfo.java @@ -0,0 +1,14 @@ + +package com.commercetools.http.netty; + +import io.vrap.rmf.base.client.SolutionInfo; + +import reactor.netty.http.client.HttpClient; + +public class NettyHttpClientSolutionInfo extends SolutionInfo { + + public NettyHttpClientSolutionInfo() { + setName("NettyHttpClient"); + setVersion(HttpClient.class.getPackage().getImplementationVersion()); + } +} diff --git a/commercetools/commercetools-reactornetty-client/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo b/commercetools/commercetools-reactornetty-client/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo new file mode 100644 index 00000000000..3c112e4202d --- /dev/null +++ b/commercetools/commercetools-reactornetty-client/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo @@ -0,0 +1 @@ +com.commercetools.http.netty.NettyHttpClientSolutionInfo diff --git a/commercetools/commercetools-reactornetty-client/src/test/java/com/commercetools/http/netty/SolutionInfoTest.java b/commercetools/commercetools-reactornetty-client/src/test/java/com/commercetools/http/netty/SolutionInfoTest.java new file mode 100644 index 00000000000..bac8a081fb4 --- /dev/null +++ b/commercetools/commercetools-reactornetty-client/src/test/java/com/commercetools/http/netty/SolutionInfoTest.java @@ -0,0 +1,14 @@ + +package com.commercetools.http.netty; + +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; + +public class SolutionInfoTest { + @Test + public void version() { + String version = new NettyHttpClientSolutionInfo().getVersion(); + + Assertions.assertThat(version).isEqualTo("1.1.19"); + } +} diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/UserAgentUtils.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/UserAgentUtils.java index d60d9c0140e..54e393a393b 100644 --- a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/UserAgentUtils.java +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/UserAgentUtils.java @@ -55,7 +55,10 @@ private static String getSolutionInfoString(List additionalSolutio public static String format(final SolutionInfo solutionInfo) { final StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append(solutionInfo.getName()).append("/").append(solutionInfo.getVersion()); + stringBuilder.append(solutionInfo.getName()); + if (isNotEmpty(solutionInfo.getVersion())) { + stringBuilder.append("/").append(solutionInfo.getVersion()); + } if (isNotEmpty(solutionInfo.getWebsite()) && isNotEmpty(solutionInfo.getEmergencyContact())) { stringBuilder.append(" ("); final String details = Stream.of(solutionInfo.getWebsite(), solutionInfo.getEmergencyContact()) diff --git a/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/VersionLoader.java b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/VersionLoader.java new file mode 100644 index 00000000000..1968e42a5e4 --- /dev/null +++ b/rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/VersionLoader.java @@ -0,0 +1,33 @@ + +package io.vrap.rmf.base.client; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Optional; +import java.util.Properties; + +public class VersionLoader { + + public static String loadVersionInfo(final String groupId, final String artifactId, final String versionFile, + final String versionProperty, final ClassLoader classLoader) { + Properties loadedProps = null; + try { + try (final InputStream is = classLoader + .getResourceAsStream("META-INF/maven/" + groupId + "/" + artifactId + "/" + versionFile)) { + if (is != null) { + final Properties props = new Properties(); + props.load(is); + loadedProps = props; + } + } + } + catch (final IOException ignored) { + } + + if (loadedProps != null) { + return Optional.ofNullable(loadedProps.get(versionProperty)).map(Object::toString).orElse(null); + } + + return null; + } +} From 4afa7d4602c9672d5edf4cf33b7e8ecaf022f93d Mon Sep 17 00:00:00 2001 From: Jens Schulze Date: Fri, 20 Dec 2024 09:32:19 +0100 Subject: [PATCH 2/7] update deps --- .../commercetools-async-http-client/build.gradle | 10 ++++++---- .../http/asynchttpclient/SolutionInfoTest.java | 2 +- .../commercetools-okhttp-client4/build.gradle | 2 +- .../commercetools/http/okhttp4/SolutionInfoTest.java | 2 +- .../commercetools-reactornetty-client/build.gradle | 4 ++-- .../com/commercetools/http/netty/SolutionInfoTest.java | 2 +- commercetools/commercetools-sdk-compat-v1/build.gradle | 2 ++ gradle-scripts/extensions.gradle | 5 +---- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/commercetools/commercetools-async-http-client/build.gradle b/commercetools/commercetools-async-http-client/build.gradle index 16fde402437..8fd78180e92 100644 --- a/commercetools/commercetools-async-http-client/build.gradle +++ b/commercetools/commercetools-async-http-client/build.gradle @@ -1,10 +1,12 @@ dependencies { api project(":rmf:rmf-java-base") - api "org.asynchttpclient:async-http-client:2.12.3" + api "org.asynchttpclient:async-http-client:2.12.4" api commons.io version commons.io_version - api "io.netty:netty-codec-http:${netty.version}" - api "io.netty:netty-codec-socks:${netty.version}" - api "io.netty:netty-handler-proxy:${netty.version}" + api "io.netty:netty-codec:4.1.115.Final" + api "io.netty:netty-codec-http:4.1.115.Final" + api "io.netty:netty-codec-socks:4.1.115.Final" + api "io.netty:netty-handler-proxy:4.1.115.Final" + api "io.netty:netty-handler:4.1.115.Final" implementation javax.validation } diff --git a/commercetools/commercetools-async-http-client/src/test/java/com/commercetools/http/asynchttpclient/SolutionInfoTest.java b/commercetools/commercetools-async-http-client/src/test/java/com/commercetools/http/asynchttpclient/SolutionInfoTest.java index ca4046fa09f..936508781bf 100644 --- a/commercetools/commercetools-async-http-client/src/test/java/com/commercetools/http/asynchttpclient/SolutionInfoTest.java +++ b/commercetools/commercetools-async-http-client/src/test/java/com/commercetools/http/asynchttpclient/SolutionInfoTest.java @@ -11,6 +11,6 @@ public class SolutionInfoTest { public void version() { String version = new AsyncHttpClientSolutionInfo().getVersion(); - Assertions.assertThat(version).isEqualTo("2.12.3"); + Assertions.assertThat(version).isEqualTo("2.12.4"); } } diff --git a/commercetools/commercetools-okhttp-client4/build.gradle b/commercetools/commercetools-okhttp-client4/build.gradle index 91851dee307..51f5ff8d41a 100644 --- a/commercetools/commercetools-okhttp-client4/build.gradle +++ b/commercetools/commercetools-okhttp-client4/build.gradle @@ -13,7 +13,7 @@ dependencies { api project(":rmf:rmf-java-base") api "com.squareup.okhttp3:okhttp:4.12.0" version { strictly '[4.0,5.0[' - prefer "4.10.0" + prefer "4.12.0" } implementation "com.squareup.okio:okio:3.9.0" diff --git a/commercetools/commercetools-okhttp-client4/src/test/java/com/commercetools/http/okhttp4/SolutionInfoTest.java b/commercetools/commercetools-okhttp-client4/src/test/java/com/commercetools/http/okhttp4/SolutionInfoTest.java index 71ab1fa7bda..975c3dbeb7e 100644 --- a/commercetools/commercetools-okhttp-client4/src/test/java/com/commercetools/http/okhttp4/SolutionInfoTest.java +++ b/commercetools/commercetools-okhttp-client4/src/test/java/com/commercetools/http/okhttp4/SolutionInfoTest.java @@ -9,6 +9,6 @@ public class SolutionInfoTest { public void version() { String version = new OkHttpClientSolutionInfo().getVersion(); - Assertions.assertThat(version).isEqualTo("3.14.9"); + Assertions.assertThat(version).isEqualTo("4.12.0"); } } diff --git a/commercetools/commercetools-reactornetty-client/build.gradle b/commercetools/commercetools-reactornetty-client/build.gradle index d8b56b74df6..91407439de5 100644 --- a/commercetools/commercetools-reactornetty-client/build.gradle +++ b/commercetools/commercetools-reactornetty-client/build.gradle @@ -2,8 +2,8 @@ dependencies { api project(":rmf:rmf-java-base") - api "io.projectreactor.netty:reactor-netty-http:1.1.19" - api "io.projectreactor.netty:reactor-netty-core:1.1.19" + api "io.projectreactor.netty:reactor-netty-http:1.2.1" + api "io.projectreactor.netty:reactor-netty-core:1.2.1" implementation javax.validation } diff --git a/commercetools/commercetools-reactornetty-client/src/test/java/com/commercetools/http/netty/SolutionInfoTest.java b/commercetools/commercetools-reactornetty-client/src/test/java/com/commercetools/http/netty/SolutionInfoTest.java index bac8a081fb4..12fd322ee06 100644 --- a/commercetools/commercetools-reactornetty-client/src/test/java/com/commercetools/http/netty/SolutionInfoTest.java +++ b/commercetools/commercetools-reactornetty-client/src/test/java/com/commercetools/http/netty/SolutionInfoTest.java @@ -9,6 +9,6 @@ public class SolutionInfoTest { public void version() { String version = new NettyHttpClientSolutionInfo().getVersion(); - Assertions.assertThat(version).isEqualTo("1.1.19"); + Assertions.assertThat(version).isEqualTo("1.2.1"); } } diff --git a/commercetools/commercetools-sdk-compat-v1/build.gradle b/commercetools/commercetools-sdk-compat-v1/build.gradle index 810859949e5..7125ef36bb6 100644 --- a/commercetools/commercetools-sdk-compat-v1/build.gradle +++ b/commercetools/commercetools-sdk-compat-v1/build.gradle @@ -21,6 +21,8 @@ dependencies { api project(':commercetools:commercetools-sdk-java-api') api ctsdkv1.client version ctsdkv1.version api ctsdkv1.models version ctsdkv1.version + api "io.netty:netty-codec:4.1.115.Final" + api "io.netty:netty-codec-http:4.1.115.Final" jmhImplementation project(':commercetools:commercetools-async-http-client') jmhImplementation project(':commercetools:commercetools-apachehttp-client') diff --git a/gradle-scripts/extensions.gradle b/gradle-scripts/extensions.gradle index 02225ef97ab..2e003815eb0 100644 --- a/gradle-scripts/extensions.gradle +++ b/gradle-scripts/extensions.gradle @@ -9,16 +9,13 @@ ext { } ] - netty = [ - version: '4.1.109.Final' - ] commons = [ text: 'org.apache.commons:commons-text:1.12.0', lang3: 'org.apache.commons:commons-lang3:3.14.0', io: 'commons-io:commons-io:2.16.1', io_version: { strictly '[2.8.0,)' - prefer '2.11.0' + prefer '2.16.1' } ] From e92dea7ad366cb9a41f77158813023247be8e451 Mon Sep 17 00:00:00 2001 From: Jens Schulze Date: Fri, 20 Dec 2024 09:36:16 +0100 Subject: [PATCH 3/7] update netty packages to latest version --- .../commercetools-async-http-client/build.gradle | 10 +++++----- commercetools/commercetools-sdk-compat-v1/build.gradle | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commercetools/commercetools-async-http-client/build.gradle b/commercetools/commercetools-async-http-client/build.gradle index 8fd78180e92..75e53993b0f 100644 --- a/commercetools/commercetools-async-http-client/build.gradle +++ b/commercetools/commercetools-async-http-client/build.gradle @@ -3,10 +3,10 @@ dependencies { api project(":rmf:rmf-java-base") api "org.asynchttpclient:async-http-client:2.12.4" api commons.io version commons.io_version - api "io.netty:netty-codec:4.1.115.Final" - api "io.netty:netty-codec-http:4.1.115.Final" - api "io.netty:netty-codec-socks:4.1.115.Final" - api "io.netty:netty-handler-proxy:4.1.115.Final" - api "io.netty:netty-handler:4.1.115.Final" + api "io.netty:netty-codec:4.1.116.Final" + api "io.netty:netty-codec-http:4.1.116.Final" + api "io.netty:netty-codec-socks:4.1.116.Final" + api "io.netty:netty-handler-proxy:4.1.116.Final" + api "io.netty:netty-handler:4.1.116.Final" implementation javax.validation } diff --git a/commercetools/commercetools-sdk-compat-v1/build.gradle b/commercetools/commercetools-sdk-compat-v1/build.gradle index 7125ef36bb6..69e51d9ef94 100644 --- a/commercetools/commercetools-sdk-compat-v1/build.gradle +++ b/commercetools/commercetools-sdk-compat-v1/build.gradle @@ -21,8 +21,8 @@ dependencies { api project(':commercetools:commercetools-sdk-java-api') api ctsdkv1.client version ctsdkv1.version api ctsdkv1.models version ctsdkv1.version - api "io.netty:netty-codec:4.1.115.Final" - api "io.netty:netty-codec-http:4.1.115.Final" + api "io.netty:netty-codec:4.1.116.Final" + api "io.netty:netty-codec-http:4.1.116.Final" jmhImplementation project(':commercetools:commercetools-async-http-client') jmhImplementation project(':commercetools:commercetools-apachehttp-client') From 612962f668eae2e1e369baf53283893d05377650 Mon Sep 17 00:00:00 2001 From: "ct-sdks[bot]" <153784748+ct-sdks[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2024 08:42:01 +0000 Subject: [PATCH 4/7] TASK: Updating license information --- .../index.json | 2 +- .../index.json | 26 +-- licenses/commercetools-http-client/index.json | 26 +-- .../commercetools-javanet-client/index.json | 2 +- .../commercetools-okhttp-client4/index.json | 28 ++- .../index.json | 40 ++--- .../commercetools-sdk-compat-v1/index.json | 50 ++++-- licenses/index.json | 161 ++++++++++++------ 8 files changed, 226 insertions(+), 109 deletions(-) diff --git a/licenses/commercetools-apachehttp-client/index.json b/licenses/commercetools-apachehttp-client/index.json index 30776393058..af3d14df20e 100644 --- a/licenses/commercetools-apachehttp-client/index.json +++ b/licenses/commercetools-apachehttp-client/index.json @@ -80,7 +80,7 @@ }, { "moduleName": "commons-io:commons-io", - "moduleVersion": "2.11.0", + "moduleVersion": "2.16.1", "moduleUrls": [ "https://commons.apache.org/proper/commons-io/" ], diff --git a/licenses/commercetools-async-http-client/index.json b/licenses/commercetools-async-http-client/index.json index febce7d26d1..5bfae58796d 100644 --- a/licenses/commercetools-async-http-client/index.json +++ b/licenses/commercetools-async-http-client/index.json @@ -114,7 +114,7 @@ }, { "moduleName": "commons-io:commons-io", - "moduleVersion": "2.11.0", + "moduleVersion": "2.16.1", "moduleUrls": [ "https://commons.apache.org/proper/commons-io/" ], @@ -141,7 +141,7 @@ }, { "moduleName": "io.netty:netty-buffer", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -154,7 +154,7 @@ }, { "moduleName": "io.netty:netty-codec", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -167,7 +167,7 @@ }, { "moduleName": "io.netty:netty-codec-http", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -180,7 +180,7 @@ }, { "moduleName": "io.netty:netty-codec-socks", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -193,7 +193,7 @@ }, { "moduleName": "io.netty:netty-common", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -206,7 +206,7 @@ }, { "moduleName": "io.netty:netty-handler", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -219,7 +219,7 @@ }, { "moduleName": "io.netty:netty-handler-proxy", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -232,7 +232,7 @@ }, { "moduleName": "io.netty:netty-resolver", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -245,7 +245,7 @@ }, { "moduleName": "io.netty:netty-transport", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -284,7 +284,7 @@ }, { "moduleName": "io.netty:netty-transport-native-unix-common", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -332,7 +332,7 @@ }, { "moduleName": "org.asynchttpclient:async-http-client", - "moduleVersion": "2.12.3", + "moduleVersion": "2.12.4", "moduleLicenses": [ { "moduleLicense": "Apache License, Version 2.0", @@ -342,7 +342,7 @@ }, { "moduleName": "org.asynchttpclient:async-http-client-netty-utils", - "moduleVersion": "2.12.3", + "moduleVersion": "2.12.4", "moduleLicenses": [ { "moduleLicense": "Apache License, Version 2.0", diff --git a/licenses/commercetools-http-client/index.json b/licenses/commercetools-http-client/index.json index febce7d26d1..5bfae58796d 100644 --- a/licenses/commercetools-http-client/index.json +++ b/licenses/commercetools-http-client/index.json @@ -114,7 +114,7 @@ }, { "moduleName": "commons-io:commons-io", - "moduleVersion": "2.11.0", + "moduleVersion": "2.16.1", "moduleUrls": [ "https://commons.apache.org/proper/commons-io/" ], @@ -141,7 +141,7 @@ }, { "moduleName": "io.netty:netty-buffer", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -154,7 +154,7 @@ }, { "moduleName": "io.netty:netty-codec", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -167,7 +167,7 @@ }, { "moduleName": "io.netty:netty-codec-http", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -180,7 +180,7 @@ }, { "moduleName": "io.netty:netty-codec-socks", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -193,7 +193,7 @@ }, { "moduleName": "io.netty:netty-common", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -206,7 +206,7 @@ }, { "moduleName": "io.netty:netty-handler", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -219,7 +219,7 @@ }, { "moduleName": "io.netty:netty-handler-proxy", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -232,7 +232,7 @@ }, { "moduleName": "io.netty:netty-resolver", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -245,7 +245,7 @@ }, { "moduleName": "io.netty:netty-transport", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -284,7 +284,7 @@ }, { "moduleName": "io.netty:netty-transport-native-unix-common", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -332,7 +332,7 @@ }, { "moduleName": "org.asynchttpclient:async-http-client", - "moduleVersion": "2.12.3", + "moduleVersion": "2.12.4", "moduleLicenses": [ { "moduleLicense": "Apache License, Version 2.0", @@ -342,7 +342,7 @@ }, { "moduleName": "org.asynchttpclient:async-http-client-netty-utils", - "moduleVersion": "2.12.3", + "moduleVersion": "2.12.4", "moduleLicenses": [ { "moduleLicense": "Apache License, Version 2.0", diff --git a/licenses/commercetools-javanet-client/index.json b/licenses/commercetools-javanet-client/index.json index 89cda78b1db..33d41070d25 100644 --- a/licenses/commercetools-javanet-client/index.json +++ b/licenses/commercetools-javanet-client/index.json @@ -80,7 +80,7 @@ }, { "moduleName": "commons-io:commons-io", - "moduleVersion": "2.11.0", + "moduleVersion": "2.16.1", "moduleUrls": [ "https://commons.apache.org/proper/commons-io/" ], diff --git a/licenses/commercetools-okhttp-client4/index.json b/licenses/commercetools-okhttp-client4/index.json index c0beafa8ae7..e2e3150987b 100644 --- a/licenses/commercetools-okhttp-client4/index.json +++ b/licenses/commercetools-okhttp-client4/index.json @@ -80,7 +80,7 @@ }, { "moduleName": "com.squareup.okhttp3:okhttp", - "moduleVersion": "4.10.0", + "moduleVersion": "4.12.0", "moduleUrls": [ "https://square.github.io/okhttp/" ], @@ -170,6 +170,32 @@ } ] }, + { + "moduleName": "org.jetbrains.kotlin:kotlin-stdlib-jdk7", + "moduleVersion": "1.8.21", + "moduleUrls": [ + "https://kotlinlang.org/" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "org.jetbrains.kotlin:kotlin-stdlib-jdk8", + "moduleVersion": "1.8.21", + "moduleUrls": [ + "https://kotlinlang.org/" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, { "moduleName": "org.jetbrains:annotations", "moduleVersion": "13.0", diff --git a/licenses/commercetools-reactornetty-client/index.json b/licenses/commercetools-reactornetty-client/index.json index 2ef38980741..36806c75b91 100644 --- a/licenses/commercetools-reactornetty-client/index.json +++ b/licenses/commercetools-reactornetty-client/index.json @@ -94,7 +94,7 @@ }, { "moduleName": "io.netty:netty-buffer", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -107,7 +107,7 @@ }, { "moduleName": "io.netty:netty-codec", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -120,7 +120,7 @@ }, { "moduleName": "io.netty:netty-codec-dns", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -133,7 +133,7 @@ }, { "moduleName": "io.netty:netty-codec-http", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -146,7 +146,7 @@ }, { "moduleName": "io.netty:netty-codec-http2", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -159,7 +159,7 @@ }, { "moduleName": "io.netty:netty-codec-socks", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -172,7 +172,7 @@ }, { "moduleName": "io.netty:netty-common", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -185,7 +185,7 @@ }, { "moduleName": "io.netty:netty-handler", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -198,7 +198,7 @@ }, { "moduleName": "io.netty:netty-handler-proxy", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -211,7 +211,7 @@ }, { "moduleName": "io.netty:netty-resolver", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -224,7 +224,7 @@ }, { "moduleName": "io.netty:netty-resolver-dns", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -237,7 +237,7 @@ }, { "moduleName": "io.netty:netty-resolver-dns-classes-macos", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -250,7 +250,7 @@ }, { "moduleName": "io.netty:netty-resolver-dns-native-macos", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -263,7 +263,7 @@ }, { "moduleName": "io.netty:netty-transport", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -276,7 +276,7 @@ }, { "moduleName": "io.netty:netty-transport-classes-epoll", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -289,7 +289,7 @@ }, { "moduleName": "io.netty:netty-transport-native-epoll", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -302,7 +302,7 @@ }, { "moduleName": "io.netty:netty-transport-native-unix-common", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -315,7 +315,7 @@ }, { "moduleName": "io.projectreactor.netty:reactor-netty-core", - "moduleVersion": "1.1.19", + "moduleVersion": "1.2.1", "moduleUrls": [ "https://github.com/reactor/reactor-netty" ], @@ -328,7 +328,7 @@ }, { "moduleName": "io.projectreactor.netty:reactor-netty-http", - "moduleVersion": "1.1.19", + "moduleVersion": "1.2.1", "moduleUrls": [ "https://github.com/reactor/reactor-netty" ], @@ -341,7 +341,7 @@ }, { "moduleName": "io.projectreactor:reactor-core", - "moduleVersion": "3.5.17", + "moduleVersion": "3.7.1", "moduleUrls": [ "https://github.com/reactor/reactor-core" ], diff --git a/licenses/commercetools-sdk-compat-v1/index.json b/licenses/commercetools-sdk-compat-v1/index.json index 3d29b075ec7..e99f83c07c5 100644 --- a/licenses/commercetools-sdk-compat-v1/index.json +++ b/licenses/commercetools-sdk-compat-v1/index.json @@ -243,9 +243,9 @@ }, { "moduleName": "io.netty:netty-buffer", - "moduleVersion": "4.0.54.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ - "http://netty.io/" + "https://netty.io/" ], "moduleLicenses": [ { @@ -256,9 +256,9 @@ }, { "moduleName": "io.netty:netty-codec", - "moduleVersion": "4.0.54.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ - "http://netty.io/" + "https://netty.io/" ], "moduleLicenses": [ { @@ -269,9 +269,9 @@ }, { "moduleName": "io.netty:netty-codec-http", - "moduleVersion": "4.0.54.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ - "http://netty.io/" + "https://netty.io/" ], "moduleLicenses": [ { @@ -282,9 +282,9 @@ }, { "moduleName": "io.netty:netty-common", - "moduleVersion": "4.0.54.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ - "http://netty.io/" + "https://netty.io/" ], "moduleLicenses": [ { @@ -295,9 +295,22 @@ }, { "moduleName": "io.netty:netty-handler", - "moduleVersion": "4.0.54.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ - "http://netty.io/" + "https://netty.io/" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "io.netty:netty-resolver", + "moduleVersion": "4.1.116.Final", + "moduleUrls": [ + "https://netty.io/" ], "moduleLicenses": [ { @@ -308,9 +321,9 @@ }, { "moduleName": "io.netty:netty-transport", - "moduleVersion": "4.0.54.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ - "http://netty.io/" + "https://netty.io/" ], "moduleLicenses": [ { @@ -332,6 +345,19 @@ } ] }, + { + "moduleName": "io.netty:netty-transport-native-unix-common", + "moduleVersion": "4.1.116.Final", + "moduleUrls": [ + "https://netty.io/" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, { "moduleName": "jakarta.annotation:jakarta.annotation-api", "moduleVersion": "2.0.0", diff --git a/licenses/index.json b/licenses/index.json index 87cb1b6dc01..9770ef214de 100644 --- a/licenses/index.json +++ b/licenses/index.json @@ -438,19 +438,6 @@ } ] }, - { - "moduleName": "com.squareup.okhttp3:okhttp", - "moduleVersion": "4.10.0", - "moduleUrls": [ - "https://square.github.io/okhttp/" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.squareup.okhttp3:okhttp", "moduleVersion": "4.12.0", @@ -565,7 +552,7 @@ }, { "moduleName": "commons-io:commons-io", - "moduleVersion": "2.11.0", + "moduleVersion": "2.16.1", "moduleUrls": [ "https://commons.apache.org/proper/commons-io/" ], @@ -605,9 +592,9 @@ }, { "moduleName": "io.netty:netty-buffer", - "moduleVersion": "4.0.54.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ - "http://netty.io/" + "https://netty.io/" ], "moduleLicenses": [ { @@ -618,7 +605,7 @@ }, { "moduleName": "io.netty:netty-buffer", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -631,9 +618,9 @@ }, { "moduleName": "io.netty:netty-codec", - "moduleVersion": "4.0.54.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ - "http://netty.io/" + "https://netty.io/" ], "moduleLicenses": [ { @@ -644,7 +631,7 @@ }, { "moduleName": "io.netty:netty-codec", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -657,7 +644,7 @@ }, { "moduleName": "io.netty:netty-codec-dns", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -670,9 +657,9 @@ }, { "moduleName": "io.netty:netty-codec-http", - "moduleVersion": "4.0.54.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ - "http://netty.io/" + "https://netty.io/" ], "moduleLicenses": [ { @@ -683,7 +670,7 @@ }, { "moduleName": "io.netty:netty-codec-http", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -696,7 +683,7 @@ }, { "moduleName": "io.netty:netty-codec-http2", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -709,7 +696,20 @@ }, { "moduleName": "io.netty:netty-codec-socks", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", + "moduleUrls": [ + "https://netty.io/" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "io.netty:netty-codec-socks", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -722,9 +722,9 @@ }, { "moduleName": "io.netty:netty-common", - "moduleVersion": "4.0.54.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ - "http://netty.io/" + "https://netty.io/" ], "moduleLicenses": [ { @@ -735,7 +735,7 @@ }, { "moduleName": "io.netty:netty-common", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -748,9 +748,9 @@ }, { "moduleName": "io.netty:netty-handler", - "moduleVersion": "4.0.54.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ - "http://netty.io/" + "https://netty.io/" ], "moduleLicenses": [ { @@ -761,7 +761,20 @@ }, { "moduleName": "io.netty:netty-handler", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", + "moduleUrls": [ + "https://netty.io/" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "io.netty:netty-handler-proxy", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -774,7 +787,7 @@ }, { "moduleName": "io.netty:netty-handler-proxy", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -787,7 +800,20 @@ }, { "moduleName": "io.netty:netty-resolver", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", + "moduleUrls": [ + "https://netty.io/" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "io.netty:netty-resolver", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -800,7 +826,7 @@ }, { "moduleName": "io.netty:netty-resolver-dns", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -813,7 +839,7 @@ }, { "moduleName": "io.netty:netty-resolver-dns-classes-macos", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -826,7 +852,7 @@ }, { "moduleName": "io.netty:netty-resolver-dns-native-macos", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -839,9 +865,9 @@ }, { "moduleName": "io.netty:netty-transport", - "moduleVersion": "4.0.54.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ - "http://netty.io/" + "https://netty.io/" ], "moduleLicenses": [ { @@ -852,7 +878,7 @@ }, { "moduleName": "io.netty:netty-transport", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -865,7 +891,7 @@ }, { "moduleName": "io.netty:netty-transport-classes-epoll", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -891,7 +917,7 @@ }, { "moduleName": "io.netty:netty-transport-native-epoll", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", "moduleUrls": [ "https://netty.io/" ], @@ -930,7 +956,20 @@ }, { "moduleName": "io.netty:netty-transport-native-unix-common", - "moduleVersion": "4.1.109.Final", + "moduleVersion": "4.1.115.Final", + "moduleUrls": [ + "https://netty.io/" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "moduleName": "io.netty:netty-transport-native-unix-common", + "moduleVersion": "4.1.116.Final", "moduleUrls": [ "https://netty.io/" ], @@ -969,7 +1008,7 @@ }, { "moduleName": "io.projectreactor.netty:reactor-netty-core", - "moduleVersion": "1.1.19", + "moduleVersion": "1.2.1", "moduleUrls": [ "https://github.com/reactor/reactor-netty" ], @@ -982,7 +1021,7 @@ }, { "moduleName": "io.projectreactor.netty:reactor-netty-http", - "moduleVersion": "1.1.19", + "moduleVersion": "1.2.1", "moduleUrls": [ "https://github.com/reactor/reactor-netty" ], @@ -995,7 +1034,7 @@ }, { "moduleName": "io.projectreactor:reactor-core", - "moduleVersion": "3.5.17", + "moduleVersion": "3.7.1", "moduleUrls": [ "https://github.com/reactor/reactor-core" ], @@ -1273,7 +1312,7 @@ }, { "moduleName": "org.asynchttpclient:async-http-client", - "moduleVersion": "2.12.3", + "moduleVersion": "2.12.4", "moduleLicenses": [ { "moduleLicense": "Apache License, Version 2.0", @@ -1293,7 +1332,7 @@ }, { "moduleName": "org.asynchttpclient:async-http-client-netty-utils", - "moduleVersion": "2.12.3", + "moduleVersion": "2.12.4", "moduleLicenses": [ { "moduleLicense": "Apache License, Version 2.0", @@ -1951,6 +1990,19 @@ } ] }, + { + "moduleName": "org.jetbrains.kotlin:kotlin-stdlib-jdk7", + "moduleVersion": "1.8.21", + "moduleUrls": [ + "https://kotlinlang.org/" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, { "moduleName": "org.jetbrains.kotlin:kotlin-stdlib-jdk7", "moduleVersion": "1.9.10", @@ -1977,6 +2029,19 @@ } ] }, + { + "moduleName": "org.jetbrains.kotlin:kotlin-stdlib-jdk8", + "moduleVersion": "1.8.21", + "moduleUrls": [ + "https://kotlinlang.org/" + ], + "moduleLicenses": [ + { + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, { "moduleName": "org.jetbrains.kotlin:kotlin-stdlib-jdk8", "moduleVersion": "1.9.10", From 1629998f3c859176f8eff68a3b75cb43a5c1c90e Mon Sep 17 00:00:00 2001 From: "ct-sdks[bot]" <153784748+ct-sdks[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 11:27:53 +0000 Subject: [PATCH 5/7] TASK: Updating license information --- licenses/index.json | 130 -------------------------------------------- 1 file changed, 130 deletions(-) diff --git a/licenses/index.json b/licenses/index.json index 2df60e6c2c2..1c18416785c 100644 --- a/licenses/index.json +++ b/licenses/index.json @@ -616,19 +616,6 @@ } ] }, - { - "moduleName": "io.netty:netty-buffer", - "moduleVersion": "4.1.115.Final", - "moduleUrls": [ - "https://netty.io/" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "io.netty:netty-codec", "moduleVersion": "4.1.115.Final", @@ -655,19 +642,6 @@ } ] }, - { - "moduleName": "io.netty:netty-codec", - "moduleVersion": "4.1.115.Final", - "moduleUrls": [ - "https://netty.io/" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "io.netty:netty-codec-dns", "moduleVersion": "4.1.115.Final", @@ -707,19 +681,6 @@ } ] }, - { - "moduleName": "io.netty:netty-codec-http", - "moduleVersion": "4.1.115.Final", - "moduleUrls": [ - "https://netty.io/" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "io.netty:netty-codec-http2", "moduleVersion": "4.1.115.Final", @@ -759,19 +720,6 @@ } ] }, - { - "moduleName": "io.netty:netty-codec-socks", - "moduleVersion": "4.1.115.Final", - "moduleUrls": [ - "https://netty.io/" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "io.netty:netty-common", "moduleVersion": "4.1.115.Final", @@ -798,19 +746,6 @@ } ] }, - { - "moduleName": "io.netty:netty-common", - "moduleVersion": "4.1.115.Final", - "moduleUrls": [ - "https://netty.io/" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "io.netty:netty-handler", "moduleVersion": "4.1.115.Final", @@ -837,19 +772,6 @@ } ] }, - { - "moduleName": "io.netty:netty-handler", - "moduleVersion": "4.1.115.Final", - "moduleUrls": [ - "https://netty.io/" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "io.netty:netty-handler-proxy", "moduleVersion": "4.1.115.Final", @@ -876,19 +798,6 @@ } ] }, - { - "moduleName": "io.netty:netty-handler-proxy", - "moduleVersion": "4.1.115.Final", - "moduleUrls": [ - "https://netty.io/" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "io.netty:netty-resolver", "moduleVersion": "4.1.115.Final", @@ -915,19 +824,6 @@ } ] }, - { - "moduleName": "io.netty:netty-resolver", - "moduleVersion": "4.1.115.Final", - "moduleUrls": [ - "https://netty.io/" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "io.netty:netty-resolver-dns", "moduleVersion": "4.1.115.Final", @@ -993,19 +889,6 @@ } ] }, - { - "moduleName": "io.netty:netty-transport", - "moduleVersion": "4.1.115.Final", - "moduleUrls": [ - "https://netty.io/" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "io.netty:netty-transport-classes-epoll", "moduleVersion": "4.1.115.Final", @@ -1097,19 +980,6 @@ } ] }, - { - "moduleName": "io.netty:netty-transport-native-unix-common", - "moduleVersion": "4.1.115.Final", - "moduleUrls": [ - "https://netty.io/" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "io.opentelemetry:opentelemetry-api", "moduleVersion": "1.45.0", From 10be852f757fb9023cc8578eb2b93fdfca58188a Mon Sep 17 00:00:00 2001 From: Jens Schulze Date: Tue, 7 Jan 2025 12:40:28 +0100 Subject: [PATCH 6/7] chore: update GH workflow for wrapper validation --- .github/workflows/benchmark.yml | 2 +- .github/workflows/ci.yml | 4 ++-- .github/workflows/codeql.yml | 2 +- .github/workflows/create-pr.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/release-snapshot.yml | 2 +- .github/workflows/release.yml | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 7f3c0cbb21d..c09674a2b85 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0 + - uses: gradle/actions/wrapper-validation@v4 - name: Setup Java uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8f8363c2b9..cd06b785729 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,7 @@ jobs: # https://help.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token # https://github.community/t/action-does-not-trigger-another-on-push-tag-action/17148/8 token: ${{ steps.generate_github_token.outputs.token }} - - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0 + - uses: gradle/actions/wrapper-validation@v4 - name: Setup Java uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4 @@ -162,7 +162,7 @@ jobs: with: token: ${{ steps.generate_github_token.outputs.token }} - - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0 + - uses: gradle/actions/wrapper-validation@v4 - name: Setup Java uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4 diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 0e3ec3dc978..262544a7144 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -50,7 +50,7 @@ jobs: - name: Checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0 + - uses: gradle/actions/wrapper-validation@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/create-pr.yml b/.github/workflows/create-pr.yml index 9da6f307e18..4fe949bb1b1 100644 --- a/.github/workflows/create-pr.yml +++ b/.github/workflows/create-pr.yml @@ -36,7 +36,7 @@ jobs: with: token: ${{ steps.generate_github_token.outputs.token }} - - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0 + - uses: gradle/actions/wrapper-validation@v4 - uses: jenschude/auto-create-pr-action@a5369414c74963e6ec065dab49066d3711b8c1db # v0.3.2 if: github.ref_name == 'gen-sdk-updates' diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index b2459342bf9..89b0b1825fe 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -54,7 +54,7 @@ jobs: distribution: 'temurin' java-version: '17' - - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0 + - uses: gradle/actions/wrapper-validation@v4 - name: Setup Graphviz uses: ts-graphviz/setup-graphviz@b1de5da23ed0a6d14e0aeee8ed52fdd87af2363c # v2.0.2 diff --git a/.github/workflows/release-snapshot.yml b/.github/workflows/release-snapshot.yml index 0fe575151e4..bb6e6a0de8f 100644 --- a/.github/workflows/release-snapshot.yml +++ b/.github/workflows/release-snapshot.yml @@ -26,7 +26,7 @@ jobs: with: token: ${{ steps.generate_github_token.outputs.token }} - - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0 + - uses: gradle/actions/wrapper-validation@v4 - name: Setup Java uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9cb04099a08..e6bc347c5d5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0 + - uses: gradle/actions/wrapper-validation@v4 - name: Setup Java uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4 @@ -75,7 +75,7 @@ jobs: ref: main token: ${{ steps.generate_github_token.outputs.token }} - - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0 + - uses: gradle/actions/wrapper-validation@v4 - run: ./gradlew -Pversion=$REF_NAME writeVersionToExamples writeVersionToReadme setVersion nextMinorVersion snapshotVersion env: From b49f5dea877e7904759bb11077e5787c34790898 Mon Sep 17 00:00:00 2001 From: Jens Schulze Date: Tue, 7 Jan 2025 12:42:46 +0100 Subject: [PATCH 7/7] chore: fix husky commit script --- .husky/pre-commit | 3 --- package.json | 39 ++++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 5a182ef106d..37236231717 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - yarn lint-staged diff --git a/package.json b/package.json index f1668c312bf..214bc21769b 100644 --- a/package.json +++ b/package.json @@ -1,21 +1,22 @@ { - "name": "commercetools-sdk-java-v2", - "version": "0.0.0", - "repository": "https://jenschude@github.com/commercetools/commercetools-sdk-java-v2.git", - "author": "Jens Schulze ", - "license": "Proprietary", - "private": true, - "engines": { - "node": ">=14.15", - "npm": ">=5" - }, - "packageManager": "yarn@4.6.0", - "dependencies": { - "husky": "9.1.7", - "lint-staged": "15.3.0" - }, - "scripts": { - "postinstall": "husky install", - "format": "./gradlew spotlessApply" - } + "name": "commercetools-sdk-java-v2", + "version": "0.0.0", + "repository": "https://jenschude@github.com/commercetools/commercetools-sdk-java-v2.git", + "author": "Jens Schulze ", + "license": "Proprietary", + "private": true, + "engines": { + "node": ">=14.15", + "npm": ">=5" + }, + "packageManager": "yarn@4.6.0", + "dependencies": { + "husky": "9.1.7", + "lint-staged": "15.3.0" + }, + "scripts": { + "postinstall": "husky install", + "format": "./gradlew spotlessApply", + "prepare": "husky" + } }