From 913c849e8fc8e51ea54252fd451ad27999e33999 Mon Sep 17 00:00:00 2001 From: James Netherton Date: Tue, 30 May 2023 08:05:35 +0100 Subject: [PATCH] Upgrade Quarkus to 3.2.0.CR1 --- docs/antora.yml | 4 +-- extensions-jvm/drill/deployment/pom.xml | 4 +++ extensions-jvm/drill/runtime/pom.xml | 4 +++ .../jta/MockTransactionManagerProducer.java | 2 +- .../kudu/deployment/KuduProcessor.java | 26 ++++++++++++++++--- .../ldap/deployment/LdapProcessor.java | 7 ++--- pom.xml | 16 ++++++------ poms/bom/pom.xml | 4 +++ .../src/main/generated/flattened-full-pom.xml | 22 +++++++++------- .../main/generated/flattened-reduced-pom.xml | 22 +++++++++------- .../flattened-reduced-verbose-pom.xml | 22 +++++++++------- 11 files changed, 88 insertions(+), 45 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index c3024802fd77..bd94cfd27a29 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -30,11 +30,11 @@ asciidoc: # Project versions camel-version: 4.0.0-M3 # replace ${camel.version} camel-docs-version: "" - quarkus-version: 3.1.0.Final # replace ${quarkus.version} + quarkus-version: 3.2.0.CR1 # replace ${quarkus.version} graalvm-version: 22.3.2 # replace ${graalvm.version} graalvm-docs-version: 22.3 min-maven-version: 3.8.2 # replace ${min-maven-version} - target-maven-version: 3.9.1 # replace ${target-maven-version} + target-maven-version: 3.9.2 # replace ${target-maven-version} # Attributes used in xrefs to other Antora components cq-camel-components: components diff --git a/extensions-jvm/drill/deployment/pom.xml b/extensions-jvm/drill/deployment/pom.xml index 07eaa0cae850..76332b36bf58 100644 --- a/extensions-jvm/drill/deployment/pom.xml +++ b/extensions-jvm/drill/deployment/pom.xml @@ -30,6 +30,10 @@ Camel Quarkus :: Drill :: Deployment + + io.quarkiverse.cxf + quarkus-cxf-woodstox-deployment + org.apache.camel.quarkus camel-quarkus-core-deployment diff --git a/extensions-jvm/drill/runtime/pom.xml b/extensions-jvm/drill/runtime/pom.xml index 2ae8376baf16..6091cbc77be8 100644 --- a/extensions-jvm/drill/runtime/pom.xml +++ b/extensions-jvm/drill/runtime/pom.xml @@ -35,6 +35,10 @@ + + io.quarkiverse.cxf + quarkus-cxf-woodstox + org.apache.camel.quarkus camel-quarkus-core diff --git a/extensions/jta/deployment/src/test/java/org/apache/camel/quarkus/component/jta/MockTransactionManagerProducer.java b/extensions/jta/deployment/src/test/java/org/apache/camel/quarkus/component/jta/MockTransactionManagerProducer.java index d4b96ade0c48..520ecf0e04bd 100644 --- a/extensions/jta/deployment/src/test/java/org/apache/camel/quarkus/component/jta/MockTransactionManagerProducer.java +++ b/extensions/jta/deployment/src/test/java/org/apache/camel/quarkus/component/jta/MockTransactionManagerProducer.java @@ -16,7 +16,7 @@ */ package org.apache.camel.quarkus.component.jta; -import io.quarkus.arc.Priority; +import jakarta.annotation.Priority; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Alternative; import jakarta.enterprise.inject.Produces; diff --git a/extensions/kudu/deployment/src/main/java/org/apache/camel/quarkus/component/kudu/deployment/KuduProcessor.java b/extensions/kudu/deployment/src/main/java/org/apache/camel/quarkus/component/kudu/deployment/KuduProcessor.java index 3dea68a8a68a..7e99333cac49 100644 --- a/extensions/kudu/deployment/src/main/java/org/apache/camel/quarkus/component/kudu/deployment/KuduProcessor.java +++ b/extensions/kudu/deployment/src/main/java/org/apache/camel/quarkus/component/kudu/deployment/KuduProcessor.java @@ -16,6 +16,12 @@ */ package org.apache.camel.quarkus.component.kudu.deployment; +import com.sun.security.auth.module.JndiLoginModule; +import com.sun.security.auth.module.KeyStoreLoginModule; +import com.sun.security.auth.module.Krb5LoginModule; +import com.sun.security.auth.module.LdapLoginModule; +import com.sun.security.auth.module.NTLoginModule; +import com.sun.security.auth.module.UnixLoginModule; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem; @@ -24,7 +30,15 @@ import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; class KuduProcessor { - + private static final String[] JDK_LOGIN_MODULE_CLASSES = { + "com.sun.jmx.remote.security.FileLoginModule", + JndiLoginModule.class.getName(), + KeyStoreLoginModule.class.getName(), + Krb5LoginModule.class.getName(), + LdapLoginModule.class.getName(), + NTLoginModule.class.getName(), + UnixLoginModule.class.getName(), + }; private static final String FEATURE = "camel-kudu"; @BuildStep @@ -44,8 +58,12 @@ NativeImageSecurityProviderBuildItem saslSecurityProvider() { @BuildStep void reflection(BuildProducer reflectiveClass) { - reflectiveClass.produce(ReflectiveClassBuildItem.builder("org.apache.kudu.tserver.Tserver$ResourceMetricsPB", - "org.apache.kudu.tserver.Tserver$ResourceMetricsPB$Builder").methods().build()); - } + reflectiveClass.produce(ReflectiveClassBuildItem.builder( + "org.apache.kudu.tserver.Tserver$ResourceMetricsPB", + "org.apache.kudu.tserver.Tserver$ResourceMetricsPB$Builder") + .methods() + .build()); + reflectiveClass.produce(ReflectiveClassBuildItem.builder(JDK_LOGIN_MODULE_CLASSES).build()); + } } diff --git a/extensions/ldap/deployment/src/main/java/org/apache/camel/quarkus/component/ldap/deployment/LdapProcessor.java b/extensions/ldap/deployment/src/main/java/org/apache/camel/quarkus/component/ldap/deployment/LdapProcessor.java index de1b011af47c..c5dd3ede23b1 100644 --- a/extensions/ldap/deployment/src/main/java/org/apache/camel/quarkus/component/ldap/deployment/LdapProcessor.java +++ b/extensions/ldap/deployment/src/main/java/org/apache/camel/quarkus/component/ldap/deployment/LdapProcessor.java @@ -21,11 +21,9 @@ import io.quarkus.deployment.builditem.AllowJNDIBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import org.jboss.logging.Logger; class LdapProcessor { - private static final Logger LOG = Logger.getLogger(LdapProcessor.class); private static final String FEATURE = "camel-ldap"; @BuildStep @@ -40,6 +38,9 @@ AllowJNDIBuildItem enableJNDI() { @BuildStep void registerForReflection(BuildProducer reflection) { - reflection.produce(ReflectiveClassBuildItem.builder("com.sun.jndi.ldap.LdapCtxFactory").build()); + reflection.produce(ReflectiveClassBuildItem + .builder("com.sun.jndi.ldap.LdapCtxFactory", "com.sun.jndi.dns.DnsContextFactory", + "com.sun.jndi.rmi.registry.RegistryContextFactory") + .build()); } } diff --git a/pom.xml b/pom.xml index bb97b18147dd..03c0237e9def 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.0.0 2.0.1 2.0.0 - 3.1.0.Final + 3.2.0.CR1 4.0.0 2.2.0 @@ -81,7 +81,7 @@ 1.8.1 1.0.0-beta.3 3.7.1 - 1.73 + 1.74 0.1.2 3.1.5 ${commons-beanutils-version} @@ -101,7 +101,7 @@ 1.121.0 1.121.0 22.3.2 - 1.55.1 + 1.56.0 ${hapi-version} ${hapi-base-version} ${hapi-fhir-version} @@ -110,7 +110,7 @@ 9.3.2.1 ${influx-java-driver-version} 0.0.16.Final - 2.15.0 + 2.15.2 ${jakarta-jms-api-version} ${json-patch-version} ${jodatime2-version} @@ -125,7 +125,7 @@ 2.4.10 3.4.0 ${kudu-version} - 1.8.21 + 1.8.22 2.24.0 ${mapstruct-version} 8.2.2 @@ -135,12 +135,12 @@ 1.48.0 ${squareup-okio-version} 0.31.0 - 0.25.0 + 0.26.0 3.22.0 3.4.27 ${reactor-netty-version} 2.9.0 - 4.5.0 + 4.6.0 ${spring-version} 2.0 0.43.1 @@ -212,7 +212,7 @@ 3.8.2 - 3.9.1 + 3.9.2 [${min-maven-version},) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 5536f4ffb32d..8709b1b9f449 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1825,6 +1825,10 @@ camel-microprofile-health ${camel.version} + + org.eclipse.parsson + jakarta.json + org.glassfish jakarta.json diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 8889b8c7aa00..fa7f55007ba5 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -1763,6 +1763,10 @@ camel-microprofile-health 4.0.0-M3 + + org.eclipse.parsson + jakarta.json + org.glassfish jakarta.json @@ -6094,7 +6098,7 @@ io.perfmark perfmark-api - 0.25.0 + 0.26.0 io.projectreactor @@ -6220,7 +6224,7 @@ io.smallrye.reactive smallrye-reactive-messaging-camel - 4.5.0 + 4.6.0 jakarta.jms @@ -6371,22 +6375,22 @@ org.bouncycastle bcmail-jdk18on - 1.73 + 1.74 org.bouncycastle bcpg-jdk18on - 1.73 + 1.74 org.bouncycastle bcprov-ext-jdk18on - 1.73 + 1.74 org.bouncycastle bcutil-jdk18on - 1.73 + 1.74 org.brotli @@ -6421,17 +6425,17 @@ org.jetbrains.kotlin kotlin-script-util - 1.8.21 + 1.8.22 org.jetbrains.kotlin kotlin-scripting-jvm - 1.8.21 + 1.8.22 org.jetbrains.kotlin kotlin-scripting-jvm-host - 1.8.21 + 1.8.22 org.mvel diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 6c6d1a5cd1cf..4b64ea299fe8 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -1763,6 +1763,10 @@ camel-microprofile-health 4.0.0-M3 + + org.eclipse.parsson + jakarta.json + org.glassfish jakarta.json @@ -6094,7 +6098,7 @@ io.perfmark perfmark-api - 0.25.0 + 0.26.0 io.projectreactor @@ -6220,7 +6224,7 @@ io.smallrye.reactive smallrye-reactive-messaging-camel - 4.5.0 + 4.6.0 jakarta.jms @@ -6361,22 +6365,22 @@ org.bouncycastle bcmail-jdk18on - 1.73 + 1.74 org.bouncycastle bcpg-jdk18on - 1.73 + 1.74 org.bouncycastle bcprov-ext-jdk18on - 1.73 + 1.74 org.bouncycastle bcutil-jdk18on - 1.73 + 1.74 org.brotli @@ -6406,17 +6410,17 @@ org.jetbrains.kotlin kotlin-script-util - 1.8.21 + 1.8.22 org.jetbrains.kotlin kotlin-scripting-jvm - 1.8.21 + 1.8.22 org.jetbrains.kotlin kotlin-scripting-jvm-host - 1.8.21 + 1.8.22 org.mvel diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 6141f13a147b..90bf85476d00 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -1763,6 +1763,10 @@ camel-microprofile-health 4.0.0-M3 + + org.eclipse.parsson + jakarta.json + org.glassfish jakarta.json @@ -6094,7 +6098,7 @@ io.perfmark perfmark-api - 0.25.0 + 0.26.0 io.projectreactor @@ -6220,7 +6224,7 @@ io.smallrye.reactive smallrye-reactive-messaging-camel - 4.5.0 + 4.6.0 jakarta.jms @@ -6361,22 +6365,22 @@ org.bouncycastle bcmail-jdk18on - 1.73 + 1.74 org.bouncycastle bcpg-jdk18on - 1.73 + 1.74 org.bouncycastle bcprov-ext-jdk18on - 1.73 + 1.74 org.bouncycastle bcutil-jdk18on - 1.73 + 1.74 org.brotli @@ -6406,17 +6410,17 @@ org.jetbrains.kotlin kotlin-script-util - 1.8.21 + 1.8.22 org.jetbrains.kotlin kotlin-scripting-jvm - 1.8.21 + 1.8.22 org.jetbrains.kotlin kotlin-scripting-jvm-host - 1.8.21 + 1.8.22 org.mvel