This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 7703407995fe45b2b7304c6cf32ccb12452e0206 Author: James Netherton <[email protected]> AuthorDate: Thu Oct 14 07:49:19 2021 +0100 Upgrade Quarkus to 2.5.0.CR1 --- docs/antora.yml | 2 +- .../camel/quarkus/core/deployment/CamelContextCustomizerTest.java | 2 +- integration-tests-support/azure/pom.xml | 6 ++++++ pom.xml | 4 ++-- poms/bom/pom.xml | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 0d3237b..3bd168d 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -24,7 +24,7 @@ asciidoc: attributes: min-maven-version: 3.6.2 # replace ${min-maven-version} target-maven-version: 3.8.1 # replace ${target-maven-version} - quarkus-version: 2.4.0.Final # replace ${quarkus.version} + quarkus-version: 999-SNAPSHOT # replace ${quarkus.version} # attributes used in xrefs to other Antora components cq-camel-components: 3.12.x@components # replace ${camel.docs.components.xref} quarkus-examples-version: latest diff --git a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java index d059d74..69f04c3 100644 --- a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java +++ b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java @@ -53,7 +53,7 @@ public class CamelContextCustomizerTest { public void execute(BuildContext context) { String methodName = "execute"; BytecodeRecorderImpl bri = new BytecodeRecorderImpl(true, getClass().getSimpleName(), methodName, - Integer.toString(methodName.hashCode()), true); + Integer.toString(methodName.hashCode()), true, s -> null); RuntimeValue<CamelContextCustomizer> value = bri .newInstance(RestConfigurationCustomizer.class.getName()); context.produce(new CamelContextCustomizerBuildItem(value)); diff --git a/integration-tests-support/azure/pom.xml b/integration-tests-support/azure/pom.xml index 42ed843..bca5eff 100644 --- a/integration-tests-support/azure/pom.xml +++ b/integration-tests-support/azure/pom.xml @@ -41,6 +41,12 @@ <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> + <exclusions> + <exclusion> + <groupId>org.jetbrains</groupId> + <artifactId>annotations</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> </project> diff --git a/pom.xml b/pom.xml index bfe9109..bc63a8d 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ <optaplanner.version>8.9.1.Final</optaplanner.version><!-- May go back to Camel's ${optaplanner-version} when they are in sync https://repo1.maven.org/maven2/org/optaplanner/optaplanner-quarkus/ --> <quarkiverse.freemarker.version>0.3.0</quarkiverse.freemarker.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/ --> <quarkiverse-minio.version>2.3.0</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ --> - <quarkus.version>2.4.0.Final</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ --> + <quarkus.version>999-SNAPSHOT</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ --> <quarkus-hazelcast-client.version>2.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ --> <quarkus-qpid-jms.version>0.29.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ --> @@ -82,7 +82,7 @@ <google-auth-library-credentials.version>0.22.2</google-auth-library-credentials.version><!-- @sync io.grpc:grpc-auth:${grpc.version} dep:com.google.auth:google-auth-library-credentials --> <guava.version>29.0-jre</guava.version> <graalvm.version>21.2.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm --> - <grpc.version>1.40.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core --> + <grpc.version>1.41.0</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core --> <gson.version>2.8.6</gson.version><!-- @sync com.ibm.jsonata4java:JSONata4Java:${jsonata4java-version} dep:com.google.code.gson:gson --> <guice-servlet.version>4.0</guice-servlet.version><!-- Spark --> <hadoop3.version>${hadoop3-version}</hadoop3.version><!-- Spark --> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 9cf7449..678db54 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1171,7 +1171,7 @@ <exclusions> <exclusion> <groupId>org.infinispan</groupId> - <artifactId>infinispan-core</artifactId> + <artifactId>*</artifactId> </exclusion> </exclusions> </dependency>
