Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[kie-issues#533] Jakarta: Update to Quarkus 3.2.5.Final #3215

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/environments/quarkus-3/before.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ mvn_cmd="mvn ${BUILD_MVN_OPTS:-} ${BUILD_MVN_OPTS_QUARKUS_UPDATE:-}"
ci="${CI:-false}"

rewrite_plugin_version=4.43.0
quarkus_version=${QUARKUS_VERSION:-3.0.0.Final}
quarkus_version=${QUARKUS_VERSION:-3.2.5.Final}

quarkus_recipe_file="${script_dir_path}/quarkus3.yml"
patch_file="${script_dir_path}"/patches/0001_before_sh.patch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
import org.apache.commons.io.IOUtils;

import io.quarkus.devtools.project.BuildTool;
import io.quarkus.devtools.project.update.QuarkusUpdateRecipe;
import io.quarkus.devtools.project.update.QuarkusUpdateRecipeIO;
import io.quarkus.devtools.project.update.operations.UpdatePropertyOperation;
import io.quarkus.devtools.project.update.rewrite.QuarkusUpdateRecipe;
import io.quarkus.devtools.project.update.rewrite.QuarkusUpdateRecipeIO;
import io.quarkus.devtools.project.update.rewrite.operations.UpdatePropertyOperation;
import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;

///usr/bin/env jbang "$0" "$@" ; exit $?
// Version to be changed when needed
//DEPS io.quarkus:quarkus-devtools-common:3.0.0.Final
//DEPS io.quarkus:quarkus-devtools-common:3.2.5.Final
//DEPS info.picocli:picocli:4.5.0

/*
Expand Down
75 changes: 44 additions & 31 deletions .ci/environments/quarkus-3/patches/0001_before_sh.patch
Original file line number Diff line number Diff line change
Expand Up @@ -330,22 +330,26 @@ index 914a5ed1a5..840df84c51 100644
</plugin>
<plugin>
diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-dependencies-bom/pom.xml
index b5586ee40a..ac8b59bb73 100644
index b5586ee40a..ea601ab665 100644
--- a/kogito-build/kogito-dependencies-bom/pom.xml
+++ b/kogito-build/kogito-dependencies-bom/pom.xml
@@ -16,9 +16,9 @@
@@ -16,75 +16,75 @@

<properties>
<!-- this version property is used in plugins but also in dependencies too -->
- <version.io.quarkus>2.16.10.Final</version.io.quarkus>
+ <version.io.quarkus>3.0.0.Final</version.io.quarkus>
+ <version.io.quarkus>3.2.5.Final</version.io.quarkus>
<version.io.quarkus.quarkus-test>${version.io.quarkus}</version.io.quarkus.quarkus-test>
- <version.org.springframework.boot>2.6.6</version.org.springframework.boot>
+ <version.org.springframework.boot>3.0.5</version.org.springframework.boot>
+ <version.org.springframework.boot>3.1.3</version.org.springframework.boot>
<version.org.apache.kafka>3.4.0</version.org.apache.kafka>

<!-- dependencies versions -->
@@ -28,48 +28,48 @@
<version.com.networknt>1.0.86</version.com.networknt>
- <version.com.fasterxml.jackson>2.14.2</version.com.fasterxml.jackson>
- <version.com.fasterxml.jackson.databind>2.14.2</version.com.fasterxml.jackson.databind>
+ <version.com.fasterxml.jackson>2.15.2</version.com.fasterxml.jackson>
+ <version.com.fasterxml.jackson.databind>2.15.2</version.com.fasterxml.jackson.databind>
<version.com.jayway.jsonpath>2.8.0</version.com.jayway.jsonpath>
<version.net.minidev.jsonsmart>2.4.10</version.net.minidev.jsonsmart>
<version.net.thisptr.jackson-jq>1.0.0-preview.20220705</version.net.thisptr.jackson-jq>
Expand All @@ -360,8 +364,9 @@ index b5586ee40a..ac8b59bb73 100644
<version.io.quarkiverse.embedded.postgresql>0.0.9</version.io.quarkiverse.embedded.postgresql>
<version.com.github.haifengl.smile>1.5.2</version.com.github.haifengl.smile>
- <version.com.github.javaparser>3.24.2</version.com.github.javaparser>
+ <version.com.github.javaparser>3.25.1</version.com.github.javaparser>
<version.com.fasterxml.jackson.datatype>2.14.2</version.com.fasterxml.jackson.datatype>
- <version.com.fasterxml.jackson.datatype>2.14.2</version.com.fasterxml.jackson.datatype>
+ <version.com.github.javaparser>3.25.3</version.com.github.javaparser>
+ <version.com.fasterxml.jackson.datatype>2.15.2</version.com.fasterxml.jackson.datatype>
<version.com.github.victools>4.18.0</version.com.github.victools>
<version.com.github.tomakehurst.wiremock>2.33.2</version.com.github.tomakehurst.wiremock>
<version.com.google.protobuf>3.22.0</version.com.google.protobuf>
Expand All @@ -373,68 +378,76 @@ index b5586ee40a..ac8b59bb73 100644
<version.com.sun.xml.bind.core>2.3.0.1</version.com.sun.xml.bind.core>
<version.com.sun.xml.bind.impl>2.3.5</version.com.sun.xml.bind.impl>
- <version.com.sun.activation>1.2.0</version.com.sun.activation>
+ <version.com.sun.activation>2.0.0</version.com.sun.activation>
+ <version.com.sun.activation>2.0.1</version.com.sun.activation>
<version.javax.annotation>1.3.2</version.javax.annotation>
<version.javax.annotation-api>1.3.2</version.javax.annotation-api>
<version.javax.inject>1</version.javax.inject>
<version.javax.validation>2.0.1.Final</version.javax.validation>
<version.javax.xml.bind>2.3.1</version.javax.xml.bind>
- <version.org.eclipse.microprofile.openapi>2.0.1</version.org.eclipse.microprofile.openapi>
- <version.ch.qos.logback>1.2.9</version.ch.qos.logback>
+ <version.org.eclipse.microprofile.openapi>3.1</version.org.eclipse.microprofile.openapi>
+ <version.org.eclipse.microprofile.openapi>3.1.1</version.org.eclipse.microprofile.openapi>
+ <version.ch.qos.logback>1.4.7</version.ch.qos.logback>

<version.io.cloudevents>2.3.0</version.io.cloudevents>
- <version.io.fabric8.kubernetes-client>6.3.1</version.io.fabric8.kubernetes-client>
- <version.io.micrometer>1.10.2</version.io.micrometer>
+ <version.io.fabric8.kubernetes-client>6.5.1</version.io.fabric8.kubernetes-client>
+ <version.io.micrometer>1.10.5</version.io.micrometer>
+ <version.io.fabric8.kubernetes-client>6.7.2</version.io.fabric8.kubernetes-client>
+ <version.io.micrometer>1.11.1</version.io.micrometer>
<version.org.flywaydb>9.8.3</version.org.flywaydb>
<version.org.postgresql>42.5.1</version.org.postgresql>
<version.io.serverlessworkflow>4.0.4.Final</version.io.serverlessworkflow>
<!-- Aligned with Quarkus 2.7 (LTS) - see https://issues.redhat.com/browse/KOGITO-7971 -->
- <version.io.smallrye-open-api>3.1.1</version.io.smallrye-open-api>
+ <version.io.smallrye-open-api>3.3.2</version.io.smallrye-open-api>
+ <version.io.smallrye-open-api>3.4.0</version.io.smallrye-open-api>
<version.org.awaitility>4.2.0</version.org.awaitility>

- <version.io.smallrye.reactive.mutiny-vertx-web-client>2.30.1</version.io.smallrye.reactive.mutiny-vertx-web-client>
+ <version.io.smallrye.reactive.mutiny-vertx-web-client>3.2.0</version.io.smallrye.reactive.mutiny-vertx-web-client>
+ <version.io.smallrye.reactive.mutiny-vertx-web-client>3.5.0</version.io.smallrye.reactive.mutiny-vertx-web-client>

<version.io.vertx>4.3.7</version.io.vertx>
- <version.io.vertx>4.3.7</version.io.vertx>
- <version.io.grpc>1.53.0</version.io.grpc>
+ <version.io.grpc>1.54.0</version.io.grpc>
+ <version.io.vertx>4.4.4</version.io.vertx>
+ <version.io.grpc>1.56.0</version.io.grpc>

- <version.io.quarkus.camel>2.15.0</version.io.quarkus.camel>
+ <version.io.quarkus.camel>3.0.0-M1</version.io.quarkus.camel>

<version.io.swagger.parser.v3>2.0.26</version.io.swagger.parser.v3>

@@ -77,14 +77,14 @@
<version.org.apache.commons>3.12.0</version.org.apache.commons>

<version.org.graalvm.nativeimage>22.3.0</version.org.graalvm.nativeimage>
- <version.org.graalvm.nativeimage>22.3.0</version.org.graalvm.nativeimage>
+ <version.org.graalvm.nativeimage>23.0.1</version.org.graalvm.nativeimage>

- <version.org.infinispan>14.0.6.Final</version.org.infinispan>
- <version.org.infinispan.protostream>4.5.1.Final</version.org.infinispan.protostream>
+ <version.org.infinispan>14.0.7.Final</version.org.infinispan>
+ <version.org.infinispan.protostream>4.6.1.Final</version.org.infinispan.protostream>
+ <version.org.infinispan>14.0.11.Final</version.org.infinispan>
+ <version.org.infinispan.protostream>4.6.2.Final</version.org.infinispan.protostream>

<version.org.rocksdb>7.10.2</version.org.rocksdb>
<!-- consider migrating to 3.x JDK 9: https://jakarta.ee/specifications/restful-ws/ -->
- <version.jakarta.ws.rs>2.1.6</version.jakarta.ws.rs>
- <version.org.jboss.resteasy>4.7.7.Final</version.org.jboss.resteasy>
- <version.org.keycloak>20.0.2</version.org.keycloak>
+ <version.jakarta.ws.rs>3.1.0</version.jakarta.ws.rs>
+ <version.org.jboss.resteasy>6.2.1.Final</version.org.jboss.resteasy>
+ <version.org.keycloak>21.0.1</version.org.keycloak>
+ <version.org.jboss.resteasy>6.2.4.Final</version.org.jboss.resteasy>
+ <version.org.keycloak>22.0.1</version.org.keycloak>
<!-- It seems that the confluent kafka cannot replace wurstmeister/kafka so easily. See FAI-729 -->
<version.wurstmeister.kafka>2.12-2.2.1</version.wurstmeister.kafka>
<version.org.mongo>4.6.1</version.org.mongo>
@@ -102,20 +102,20 @@
<version.org.junit.vintage>5.9.2</version.org.junit.vintage>
<version.org.junit.platform>1.9.2</version.org.junit.platform> <!-- otherwise Quarkus brings its own, silently disabling some tests -->
@@ -98,24 +98,24 @@
<version.org.hamcrest>1.3</version.org.hamcrest> <!-- else old version coming from Mockito wins and breaks tests -->
<version.org.junit.minor>8.2</version.org.junit.minor> <!-- so that org.junit.platform and org.junit can share the same minor version -->
<version.org.junit>5.${version.org.junit.minor}</version.org.junit>
- <version.org.junit.jupiter>5.9.2</version.org.junit.jupiter>
- <version.org.junit.vintage>5.9.2</version.org.junit.vintage>
- <version.org.junit.platform>1.9.2</version.org.junit.platform> <!-- otherwise Quarkus brings its own, silently disabling some tests -->
+ <version.org.junit.jupiter>5.9.3</version.org.junit.jupiter>
+ <version.org.junit.vintage>5.9.3</version.org.junit.vintage>
+ <version.org.junit.platform>1.9.3</version.org.junit.platform> <!-- otherwise Quarkus brings its own, silently disabling some tests -->
<version.org.junit.pioneer>1.5.0</version.org.junit.pioneer>
- <version.org.mockito>4.11.0</version.org.mockito>
+ <version.org.mockito>5.2.0</version.org.mockito>
<version.org.mockito>4.11.0</version.org.mockito>
<version.org.testcontainers>1.17.6</version.org.testcontainers>
<version.org.xmlunit-core>2.9.1</version.org.xmlunit-core>
- <version.io.rest-assured>4.5.1</version.io.rest-assured>
Expand All @@ -450,7 +463,7 @@ index b5586ee40a..ac8b59bb73 100644

- <version.maven>3.8.6</version.maven>
- <version.maven.plugin>3.6.0</version.maven.plugin>
+ <version.maven>3.9.1</version.maven>
+ <version.maven>3.9.3</version.maven>
+ <version.maven.plugin>3.7.1</version.maven.plugin>
<version.maven.invoker>3.2.0</version.maven.invoker>

Expand All @@ -460,7 +473,7 @@ index b5586ee40a..ac8b59bb73 100644
<version.com.github.stephenc.jcip>1.0-1</version.com.github.stephenc.jcip>
<version.black.ninia>4.1.1</version.black.ninia>
- <version.com.google.guava>32.0.1-jre</version.com.google.guava>
+ <version.com.google.guava>31.1-jre</version.com.google.guava>
+ <version.com.google.guava>32.0.0-jre</version.com.google.guava>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -506,7 +519,7 @@ index b5586ee40a..ac8b59bb73 100644
- <version>${version.com.sun.xml.bind.impl}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>4.0.2</version>
+ <version>4.0.3</version>
</dependency>
<dependency>
- <groupId>com.sun.activation</groupId>
Expand Down Expand Up @@ -4705,15 +4718,15 @@ index 5b7f0e8a75..712d3d1e17 100644
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
diff --git a/springboot/bom/pom.xml b/springboot/bom/pom.xml
index 8247d78ce6..10b6eff566 100644
index 8247d78ce6..6822b0dd32 100644
--- a/springboot/bom/pom.xml
+++ b/springboot/bom/pom.xml
@@ -22,10 +22,9 @@
<version.org.codehaus.groovy>2.4.16</version.org.codehaus.groovy>
<version.org.spockframework>1.3-groovy-2.4</version.org.spockframework>
<!-- Spring Boot Cloud aligned with Spring Boot Framework version. See: https://spring.io/projects/spring-cloud -->
- <version.org.springframework.cloud.kubernetes.fabric8>2.1.1</version.org.springframework.cloud.kubernetes.fabric8>
+ <version.org.springframework.cloud.kubernetes.fabric8>3.0.2</version.org.springframework.cloud.kubernetes.fabric8>
+ <version.org.springframework.cloud.kubernetes.fabric8>3.0.4</version.org.springframework.cloud.kubernetes.fabric8>
<!-- CVE-2022-25857: Upgrading snakeyaml until we upgrade to Spring Boot 3.x -->
<!-- See: https://github.com/spring-projects/spring-boot/issues/32221 -->
- <snakeyaml.version>2.0</snakeyaml.version>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-dependencies-bom/pom.xml
index 244c1c4a8f..a244f76be0 100644
index ea601ab665..32b44704c8 100644
--- a/kogito-build/kogito-dependencies-bom/pom.xml
+++ b/kogito-build/kogito-dependencies-bom/pom.xml
@@ -45,7 +45,7 @@
<version.com.sun.activation>2.0.0</version.com.sun.activation>
@@ -48,7 +48,7 @@
<version.com.sun.activation>2.0.1</version.com.sun.activation>
<version.javax.annotation>1.3.2</version.javax.annotation>
<version.javax.annotation-api>1.3.2</version.javax.annotation-api>
- <version.javax.inject>1</version.javax.inject>
+ <version.javax.inject>2.0.1</version.javax.inject>
<version.javax.validation>2.0.1.Final</version.javax.validation>
<version.javax.xml.bind>2.3.1</version.javax.xml.bind>
<version.org.eclipse.microprofile.openapi>3.1</version.org.eclipse.microprofile.openapi>
@@ -545,8 +545,8 @@
<version.org.eclipse.microprofile.openapi>3.1.1</version.org.eclipse.microprofile.openapi>
@@ -580,8 +580,8 @@
<version>3.0.2</version>
</dependency>
<dependency>
Expand All @@ -23,7 +23,7 @@ index 244c1c4a8f..a244f76be0 100644
</dependency>
<dependency>
diff --git a/quarkus/addons/events/mongodb/runtime/pom.xml b/quarkus/addons/events/mongodb/runtime/pom.xml
index 293f428f79..a7b7c9d656 100644
index 1594de9f17..abfabbf1d3 100644
--- a/quarkus/addons/events/mongodb/runtime/pom.xml
+++ b/quarkus/addons/events/mongodb/runtime/pom.xml
@@ -24,8 +24,8 @@
Expand All @@ -38,7 +38,7 @@ index 293f428f79..a7b7c9d656 100644
<dependency>
<groupId>org.eclipse.microprofile.config</groupId>
diff --git a/quarkus/addons/events/process/runtime/pom.xml b/quarkus/addons/events/process/runtime/pom.xml
index 3698355e62..e6ba49bf97 100644
index 6eedd46d9d..ea1a785a80 100644
--- a/quarkus/addons/events/process/runtime/pom.xml
+++ b/quarkus/addons/events/process/runtime/pom.xml
@@ -25,8 +25,8 @@
Expand All @@ -53,7 +53,7 @@ index 3698355e62..e6ba49bf97 100644
</dependency>
<dependency>
diff --git a/quarkus/addons/messaging/common/pom.xml b/quarkus/addons/messaging/common/pom.xml
index fe85ed89ed..a596593673 100644
index 1aa1530e48..5e2d3efae6 100644
--- a/quarkus/addons/messaging/common/pom.xml
+++ b/quarkus/addons/messaging/common/pom.xml
@@ -45,8 +45,8 @@
Expand All @@ -68,7 +68,7 @@ index fe85ed89ed..a596593673 100644
</dependency>

diff --git a/quarkus/addons/rest-exception-handler/pom.xml b/quarkus/addons/rest-exception-handler/pom.xml
index fad6357690..545742ea7a 100644
index abbc56828f..7071899ac2 100644
--- a/quarkus/addons/rest-exception-handler/pom.xml
+++ b/quarkus/addons/rest-exception-handler/pom.xml
@@ -22,8 +22,8 @@
Expand Down
Loading