This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch 3.8.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit db2edc6f36d395a0ed79a28b2219286b0613cf5c Author: James Netherton <[email protected]> AuthorDate: Fri Mar 15 18:36:23 2024 +0000 Upgrade Quarkus to 3.8.3 --- docs/antora.yml | 4 ++-- extensions/js-dsl/runtime/pom.xml | 14 ++++---------- pom.xml | 4 ++-- poms/bom/pom.xml | 8 +++++++- poms/bom/src/main/generated/flattened-full-pom.xml | 17 ++++++++++++++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 10 ++++++++-- .../main/generated/flattened-reduced-verbose-pom.xml | 10 ++++++++-- 7 files changed, 45 insertions(+), 22 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 8332a4affe..0aa353fa86 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -28,8 +28,8 @@ asciidoc: camel-version: 4.4.1 # replace ${camel.version} camel-docs-version: 4.4.x camel-quarkus-version: 3.8.1 # replace ${camel-quarkus.version} - quarkus-version: 3.8.2 # replace ${quarkus.version} - graalvm-version: 23.0.1 # replace ${graalvm.version} + quarkus-version: 3.8.3 # replace ${quarkus.version} + graalvm-version: 23.1.2 # replace ${graalvm.version} graalvm-docs-version: jdk21 # replace ${graalvm-docs.version} mapstruct-version: 1.5.5.Final # replace ${mapstruct.version} min-maven-version: 3.8.2 # replace ${min-maven-version} diff --git a/extensions/js-dsl/runtime/pom.xml b/extensions/js-dsl/runtime/pom.xml index 9744f73c78..d26badad9b 100644 --- a/extensions/js-dsl/runtime/pom.xml +++ b/extensions/js-dsl/runtime/pom.xml @@ -46,6 +46,10 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-js-dsl</artifactId> </dependency> + <dependency> + <groupId>org.graalvm.js</groupId> + <artifactId>js-language</artifactId> + </dependency> </dependencies> <build> @@ -53,16 +57,6 @@ <plugin> <groupId>io.quarkus</groupId> <artifactId>quarkus-extension-maven-plugin</artifactId> - <configuration> - <parentFirstArtifacts> - <parentFirstArtifact>org.graalvm.sdk:graal-sdk</parentFirstArtifact> - <parentFirstArtifact>org.graalvm.nativeimage:svm</parentFirstArtifact> - <parentFirstArtifact>org.graalvm.truffle:truffle-api</parentFirstArtifact> - <parentFirstArtifact>org.graalvm.js:js</parentFirstArtifact> - <parentFirstArtifact>org.graalvm.regex:regex</parentFirstArtifact> - <parentFirstArtifact>com.ibm.icu:icu4j</parentFirstArtifact> - </parentFirstArtifacts> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/pom.xml b/pom.xml index cb3bd3fb16..d5db42bc6f 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ <quarkiverse-mybatis.version>2.2.1</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ --> <quarkiverse-pooled-jms.version>2.3.0</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ --> <quarkiverse-tika.version>2.0.2</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ --> - <quarkus.version>3.8.2</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ --> + <quarkus.version>3.8.3</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ --> <quarkus-hazelcast-client.version>4.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ --> <quarkus-qpid-jms.version>2.6.0</quarkus-qpid-jms.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ --> @@ -100,7 +100,7 @@ <google-cloud-bom.version>0.212.0</google-cloud-bom.version><!-- @sync com.google.cloud:libraries-bom:${google-cloud-bom-version} dep:com.google.cloud:google-cloud-bom --> <google-cloud-pubsub-bom.version>1.126.2</google-cloud-pubsub-bom.version><!-- @sync com.google.cloud:google-cloud-bom:${google-cloud-bom.version} dep:com.google.cloud:google-cloud-pubsub-bom --> <google-cloud-pubsub.version>1.126.2</google-cloud-pubsub.version><!-- @sync com.google.cloud:google-cloud-pubsub-bom:${google-cloud-pubsub-bom.version} dep:com.google.cloud:google-cloud-pubsub --> - <graalvm.version>23.0.1</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk --> + <graalvm.version>23.1.2</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk --> <graalvm-docs.version>jdk21</graalvm-docs.version><!-- @sync io.quarkus:quarkus-documentation:${quarkus.version} prop:graal-community.tag-for-documentation --> <groovy.version>4.0.18</groovy.version><!-- @sync io.quarkiverse.groovy:quarkus-groovy-parent:${quarkiverse-groovy.version} prop:groovy.version --> <grpc.version>1.59.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core --> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 4139d85e60..e0bbc0afee 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1611,6 +1611,12 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-js-dsl</artifactId> <version>${camel.version}</version> + <exclusions> + <exclusion> + <groupId>org.graalvm.js</groupId> + <artifactId>js</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> @@ -6768,7 +6774,7 @@ </dependency> <dependency> <groupId>org.graalvm.js</groupId> - <artifactId>js</artifactId> + <artifactId>js-language</artifactId> <version>${graalvm.version}</version> </dependency> <dependency> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 48f3bada5e..784627e966 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -1549,6 +1549,12 @@ <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-js-dsl</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.4.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>org.graalvm.js</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>js</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6691,13 +6697,13 @@ </dependency> <dependency> <groupId>org.graalvm.js</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>js</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>23.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>js-language</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>23.1.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.graalvm.js</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>js-scriptengine</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>23.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>23.1.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.influxdb</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -19852,6 +19858,11 @@ <artifactId>txw2</artifactId><!-- io.quarkus:quarkus-bom:3.8.1 --> <version>4.0.4</version><!-- io.quarkus:quarkus-bom:3.8.1 --> </dependency> + <dependency> + <groupId>org.graalvm.js</groupId><!-- io.quarkus:quarkus-bom:3.8.1 --> + <artifactId>js</artifactId><!-- io.quarkus:quarkus-bom:3.8.1 --> + <version>23.0.1</version><!-- io.quarkus:quarkus-bom:3.8.1 --> + </dependency> <dependency> <groupId>org.graalvm.sdk</groupId><!-- io.quarkus:quarkus-bom:3.8.1 --> <artifactId>graal-sdk</artifactId><!-- io.quarkus:quarkus-bom:3.8.1 --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 891c513a39..f35be6dfcc 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -1549,6 +1549,12 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-js-dsl</artifactId> <version>4.4.1</version> + <exclusions> + <exclusion> + <groupId>org.graalvm.js</groupId> + <artifactId>js</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> @@ -6611,8 +6617,8 @@ </dependency> <dependency> <groupId>org.graalvm.js</groupId> - <artifactId>js</artifactId> - <version>23.0.1</version> + <artifactId>js-language</artifactId> + <version>23.1.2</version> </dependency> <dependency> <groupId>org.influxdb</groupId> 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 f069c94515..720bc92ce9 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -1549,6 +1549,12 @@ <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-js-dsl</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.4.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>org.graalvm.js</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>js</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6611,8 +6617,8 @@ </dependency> <dependency> <groupId>org.graalvm.js</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>js</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>23.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>js-language</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>23.1.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.influxdb</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
