diff --git a/.circleci/config.yml b/.circleci/config.yml index d98de7e40..216c2a5b8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -124,6 +124,9 @@ executors: j21: docker: - image: 'cimg/openjdk:21.0' + j23: + docker: + - image: 'cimg/openjdk:23.0' jobs: @@ -524,6 +527,7 @@ workflows: jdk: - 'j17' - 'j21' + - 'j23' filters: tags: only: /^v.*/ @@ -565,7 +569,7 @@ workflows: - 'true' - 'false' graalvm-version: - - '22.0.1-graalce' + - '24.0.1-graalce' - '21.0.2-graalce' filters: tags: @@ -586,7 +590,7 @@ workflows: - 'true' - 'false' graalvm-version: - - '22.0.1-graalce' + - '24.0.1-graalce' - '21.0.2-graalce' filters: tags: diff --git a/pom.xml b/pom.xml index e19c39f75..6d933e342 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ arangodb-1 target/spotbugsXml.xml site/jacoco/jacoco.xml - 23.1.1 + 24.2.1 @@ -83,13 +83,6 @@ - - io.vertx - vertx-stack-depchain - 4.5.7 - pom - import - com.fasterxml.jackson jackson-bom @@ -97,6 +90,13 @@ import pom + + io.vertx + vertx-stack-depchain + 4.5.7 + pom + import + com.google.code.findbugs jsr305 @@ -105,7 +105,7 @@ org.slf4j slf4j-api - 2.0.9 + 2.0.17 jakarta.json @@ -178,7 +178,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + 3.5.0 enforce @@ -199,7 +199,7 @@ - 3.6 + 3.6.3 @@ -209,14 +209,51 @@ org.codehaus.mojo extra-enforcer-rules - 1.8.0 + 1.10.0 + + org.codehaus.mojo + versions-maven-plugin + 2.18.0 + + + + + + + regex + (?i).*(alpha|beta|m|rc).*(\d+)? + + + + + io.vertx + + + regex + 5..* + + + + + io.netty + + + regex + .* + + + + + + + org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + 3.1.4 10 @@ -224,7 +261,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.13 + 1.7.0 true ossrh @@ -241,7 +278,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.14.0 -Xlint:unchecked @@ -261,22 +298,22 @@ org.apache.maven.plugins maven-clean-plugin - 3.4.0 + 3.5.0 org.apache.maven.plugins maven-install-plugin - 3.1.2 + 3.1.4 org.apache.maven.plugins maven-site-plugin - 3.12.1 + 3.21.0 org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.5.3 true @@ -284,12 +321,12 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + 3.6.1 org.jacoco jacoco-maven-plugin - 0.8.12 + 0.8.13 org.apache.maven.plugins @@ -299,12 +336,12 @@ org.sonarsource.scanner.maven sonar-maven-plugin - 4.0.0.4121 + 5.1.0.4751 org.apache.maven.plugins maven-shade-plugin - 3.4.1 + 3.6.0 com.google.code.maven-replacer-plugin @@ -314,7 +351,17 @@ org.apache.maven.plugins maven-surefire-report-plugin - 3.4.0 + 3.5.3 + + + org.codehaus.mojo + flatten-maven-plugin + 1.7.0 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.11.2 diff --git a/release-parent/pom.xml b/release-parent/pom.xml index 6daa19a9b..5dca61d60 100644 --- a/release-parent/pom.xml +++ b/release-parent/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.1 @@ -36,7 +36,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.8.0 @@ -57,7 +56,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.2.7 --pinentry-mode @@ -77,7 +76,6 @@ org.codehaus.mojo flatten-maven-plugin - 1.4.1 oss @@ -139,7 +137,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.7.3.4 + 4.9.3.0 spotbugs/spotbugs-exclude.xml diff --git a/shaded/src/main/java/graal/netty/graal/NettySubstitutions.java b/shaded/src/main/java/graal/netty/graal/NettySubstitutions.java index fb9b8b1bb..4eab2181b 100644 --- a/shaded/src/main/java/graal/netty/graal/NettySubstitutions.java +++ b/shaded/src/main/java/graal/netty/graal/NettySubstitutions.java @@ -166,7 +166,6 @@ final class Target_io_netty_handler_ssl_JdkSslClientContext { } } - @TargetClass(className = "io.netty.handler.ssl.SslHandler$SslEngineType") final class Target_io_netty_handler_ssl_SslHandler$SslEngineType { @@ -237,7 +236,6 @@ static SslContext newClientContextInternal(SslProvider provider, Provider sslCon } } - @TargetClass(className = "io.netty.handler.ssl.JdkDefaultApplicationProtocolNegotiator") final class Target_io_netty_handler_ssl_JdkDefaultApplicationProtocolNegotiator { diff --git a/test-functional/pom.xml b/test-functional/pom.xml index b622bf2d0..8b4f0d900 100644 --- a/test-functional/pom.xml +++ b/test-functional/pom.xml @@ -151,7 +151,7 @@ org.graalvm.buildtools native-maven-plugin - 0.10.2 + 0.10.6 true diff --git a/test-functional/src/test-default/java/graal/netty/graal/NettySubstitutions.java b/test-functional/src/test-default/java/graal/netty/graal/NettySubstitutions.java index fb9b8b1bb..4eab2181b 100644 --- a/test-functional/src/test-default/java/graal/netty/graal/NettySubstitutions.java +++ b/test-functional/src/test-default/java/graal/netty/graal/NettySubstitutions.java @@ -166,7 +166,6 @@ final class Target_io_netty_handler_ssl_JdkSslClientContext { } } - @TargetClass(className = "io.netty.handler.ssl.SslHandler$SslEngineType") final class Target_io_netty_handler_ssl_SslHandler$SslEngineType { @@ -237,7 +236,6 @@ static SslContext newClientContextInternal(SslProvider provider, Provider sslCon } } - @TargetClass(className = "io.netty.handler.ssl.JdkDefaultApplicationProtocolNegotiator") final class Target_io_netty_handler_ssl_JdkDefaultApplicationProtocolNegotiator { diff --git a/test-non-functional/pom.xml b/test-non-functional/pom.xml index 8fc7919e9..a72f2e618 100644 --- a/test-non-functional/pom.xml +++ b/test-non-functional/pom.xml @@ -59,7 +59,7 @@ io.smallrye.config smallrye-config-core - 2.13.3 + 3.13.1 test diff --git a/test-non-functional/src/test/java/mp/ConfigUtilsMP.java b/test-non-functional/src/test/java/mp/ConfigUtilsMP.java index dabd62cde..07277115f 100644 --- a/test-non-functional/src/test/java/mp/ConfigUtilsMP.java +++ b/test-non-functional/src/test/java/mp/ConfigUtilsMP.java @@ -1,7 +1,7 @@ package mp; import com.arangodb.config.ArangoConfigProperties; -import io.smallrye.config.PropertiesConfigSourceProvider; +import io.smallrye.config.PropertiesConfigSourceLoader; import io.smallrye.config.SmallRyeConfig; import io.smallrye.config.SmallRyeConfigBuilder; @@ -17,7 +17,7 @@ public static ArangoConfigProperties loadConfigMP(final String location) { public static ArangoConfigProperties loadConfigMP(final String location, final String prefix) { SmallRyeConfig cfg = new SmallRyeConfigBuilder() - .withSources(new PropertiesConfigSourceProvider(location, ConfigUtilsMP.class.getClassLoader(), false)) + .withSources(PropertiesConfigSourceLoader.inClassPath(location, 0, ConfigUtilsMP.class.getClassLoader())) .withMapping(ArangoConfigPropertiesMPImpl.class, prefix) .build(); return cfg.getConfigMapping(ArangoConfigPropertiesMPImpl.class, prefix); diff --git a/test-parent/pom.xml b/test-parent/pom.xml index 9fd5c885c..a72786f1a 100644 --- a/test-parent/pom.xml +++ b/test-parent/pom.xml @@ -79,35 +79,35 @@ org.junit junit-bom - 5.10.2 + 5.12.2 pom import org.eclipse yasson - 3.0.3 + 3.0.4 org.slf4j slf4j-simple - 2.0.9 + 2.0.17 org.assertj assertj-core - 3.25.3 + 3.27.3 org.awaitility awaitility - 4.2.1 + 4.3.0 test com.tngtech.archunit archunit-junit5 - 1.2.1 + 1.4.1 @@ -132,7 +132,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.3.1 + 3.5.3 true diff --git a/test-perf/pom.xml b/test-perf/pom.xml index 4e95e86f7..780965794 100644 --- a/test-perf/pom.xml +++ b/test-perf/pom.xml @@ -43,7 +43,6 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.1 package