Quarkus 3: update patches (#3168)

* Quarkus 3: update patches * [Quarkus 3] Updated rewrite data * Quarkus 3: updates patches * update patch * Updated recipe * update recipe * [Quarkus 3] Updated rewrite data --------- Co-authored-by: radtriste <[email protected]> Co-authored-by: Jenkins CI <[email protected]>
apache · Aug 9, 2023 · 713d353 · 713d353
1 parent 486a43b
commit 713d353
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 49 deletions.
diff --git a/.ci/environments/quarkus-3/patches/0001_before_sh.patch b/.ci/environments/quarkus-3/patches/0001_before_sh.patch
@@ -330,14 +330,14 @@ 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 4c79cc0340..8cdb515b46 100644
+index ab4b803d0f..09bf47e0d9 100644
 --- a/kogito-build/kogito-dependencies-bom/pom.xml
 +++ b/kogito-build/kogito-dependencies-bom/pom.xml
 @@ -16,9 +16,9 @@
 
    <properties>
      <!-- this version property is used in plugins but also in dependencies too -->
--    <version.io.quarkus>2.16.8.Final</version.io.quarkus>
+-    <version.io.quarkus>2.16.9.Final</version.io.quarkus>
 +    <version.io.quarkus>3.0.0.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>
@@ -351,12 +351,12 @@ index 4c79cc0340..8cdb515b46 100644
      <version.net.thisptr.jackson-jq>1.0.0-preview.20220705</version.net.thisptr.jackson-jq>
 -    <version.io.quarkiverse.jackson-jq>1.1.0</version.io.quarkiverse.jackson-jq>
 -    <version.io.quarkiverse.openapi.generator>1.3.8</version.io.quarkiverse.openapi.generator>
--    <version.io.quarkiverse.asyncapi>0.0.5</version.io.quarkiverse.asyncapi>
+-    <version.io.quarkiverse.asyncapi>0.0.6</version.io.quarkiverse.asyncapi>
 -    <version.io.quarkiverse.reactivemessaging.http>1.1.5</version.io.quarkiverse.reactivemessaging.http>
 +    <version.io.quarkiverse.jackson-jq>2.0.1</version.io.quarkiverse.jackson-jq>
-+    <version.io.quarkiverse.openapi.generator>2.2.2</version.io.quarkiverse.openapi.generator>
-+    <version.io.quarkiverse.asyncapi>0.1.0</version.io.quarkiverse.asyncapi>
-+    <version.io.quarkiverse.reactivemessaging.http>2.0.1</version.io.quarkiverse.reactivemessaging.http>
++    <version.io.quarkiverse.openapi.generator>2.2.8</version.io.quarkiverse.openapi.generator>
++    <version.io.quarkiverse.asyncapi>0.2.0</version.io.quarkiverse.asyncapi>
++    <version.io.quarkiverse.reactivemessaging.http>2.0.2</version.io.quarkiverse.reactivemessaging.http>
      <version.io.quarkiverse.embedded.postgresql>0.0.8</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>
@@ -366,7 +366,7 @@ index 4c79cc0340..8cdb515b46 100644
      <version.com.github.tomakehurst.wiremock>2.33.2</version.com.github.tomakehurst.wiremock>
      <version.com.google.protobuf>3.22.0</version.com.google.protobuf>
      <!-- We don't use gson directly. This is just to align versions of transitive dependencies -->
--    <version.com.google.gson>2.9.0</version.com.google.gson>
+-    <version.com.google.gson>2.10</version.com.google.gson>
 +    <version.com.google.gson>2.10.1</version.com.google.gson>
      <!-- currently required for integration test only -->
      <version.com.oracle.database.jdbc>21.3.0.0</version.com.oracle.database.jdbc>
@@ -401,7 +401,7 @@ index 4c79cc0340..8cdb515b46 100644
 +    <version.io.smallrye.reactive.mutiny-vertx-web-client>3.2.0</version.io.smallrye.reactive.mutiny-vertx-web-client>
 
      <version.io.vertx>4.3.7</version.io.vertx>
--    <version.io.grpc>1.51.1</version.io.grpc>
+-    <version.io.grpc>1.53.0</version.io.grpc>
 +    <version.io.grpc>1.54.0</version.io.grpc>
 
 -    <version.io.quarkus.camel>2.15.0</version.io.quarkus.camel>
@@ -1819,7 +1819,7 @@ index eb4b1234d8..f71582eba9 100644
      }
  }
 diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/message/CloudEventHttpOutgoingDecorator.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/message/CloudEventHttpOutgoingDecorator.java
-index 9de0c4cb5b..c4174c800b 100644
+index 53c35657ad..75b74d2c89 100644
 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/message/CloudEventHttpOutgoingDecorator.java
 +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/message/CloudEventHttpOutgoingDecorator.java
 @@ -15,7 +15,7 @@
@@ -3726,12 +3726,29 @@ index 6c3bc7471b..6d23aa87de 100644
 
  import com.fasterxml.jackson.databind.ObjectMapper;
 
+diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/asyncapi/AsyncAPIInfoConverter.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/asyncapi/AsyncAPIInfoConverter.java
+index c44ad0c604..c476df0aa1 100644
+--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/asyncapi/AsyncAPIInfoConverter.java
++++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/asyncapi/AsyncAPIInfoConverter.java
+@@ -24,9 +24,9 @@ import org.kie.kogito.serverless.workflow.asyncapi.AsyncChannelInfo;
+ import org.kie.kogito.serverless.workflow.asyncapi.AsyncInfo;
+ import org.kie.kogito.serverless.workflow.asyncapi.AsyncInfoConverter;
+
+-import com.asyncapi.v2.model.AsyncAPI;
+-import com.asyncapi.v2.model.channel.ChannelItem;
+-import com.asyncapi.v2.model.channel.operation.Operation;
++import com.asyncapi.v2._6_0.model.AsyncAPI;
++import com.asyncapi.v2._6_0.model.channel.ChannelItem;
++import com.asyncapi.v2._6_0.model.channel.operation.Operation;
+
+ import io.quarkiverse.asyncapi.config.AsyncAPIRegistry;
+
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java
-index 398cb4257e..72aa1347bc 100644
+index 4940e8a246..7be51afdd0 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java
-@@ -26,7 +26,7 @@ import java.util.List;
- import java.util.ServiceLoader;
+@@ -27,7 +27,7 @@ import java.util.ServiceLoader;
+ import java.util.stream.Collectors;
  import java.util.stream.Stream;
 
 -import javax.inject.Inject;

diff --git a/.ci/environments/quarkus-3/patches/0004_javax.enterprise_to_jakarta.enterprise.patch b/.ci/environments/quarkus-3/patches/0004_javax.enterprise_to_jakarta.enterprise.patch
@@ -166,7 +166,7 @@ index 81e9ad561b..99de8839df 100644
      private java.util.Map<String, org.kie.kogito.process.Process<? extends org.kie.kogito.Model>> mappedProcesses = new java.util.HashMap<>();
 
 diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/config/ProcessConfigQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/config/ProcessConfigQuarkusTemplate.java
-index b31e82652d..fd466857b8 100644
+index a4c29059f7..96001e751e 100644
 --- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/config/ProcessConfigQuarkusTemplate.java
 +++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/config/ProcessConfigQuarkusTemplate.java
 @@ -15,7 +15,7 @@
@@ -177,7 +177,7 @@ index b31e82652d..fd466857b8 100644
 +import jakarta.enterprise.inject.Instance;
 
  import org.kie.api.event.process.ProcessEventListener;
- import org.kie.kogito.event.EventPublisher;
+ import org.kie.kogito.auth.IdentityProvider;
 diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/persistence/KafkaStreamsTopologyProducerJavaTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/persistence/KafkaStreamsTopologyProducerJavaTemplate.java
 index 736f1de9d7..d6ac80b21a 100644
 --- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/persistence/KafkaStreamsTopologyProducerJavaTemplate.java

diff --git a/.ci/environments/quarkus-3/patches/0022_spring_boot_it_fix.patch b/.ci/environments/quarkus-3/patches/0022_spring_boot_it_fix.patch
@@ -89,6 +89,24 @@ index 83085a9be3..14a8f95d22 100644
  import org.springframework.test.context.junit.jupiter.SpringExtension;
 
  import static io.restassured.RestAssured.given;
+diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml
+index c102fb4ad1..cda15d9596 100644
+--- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml
++++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml
+@@ -39,11 +39,10 @@
+     </dependency>
+     <dependency>
+       <groupId>org.infinispan</groupId>
+-      <artifactId>infinispan-spring-boot-starter-remote</artifactId>
++      <artifactId>infinispan-spring-boot3-starter-remote</artifactId>
+     </dependency>
+     <dependency>
+-      <groupId>org.kie.kogito</groupId>
+-      <artifactId>kogito-addons-springboot-process-management</artifactId>
++      <groupId>org.kie.kogito</groupId>      <artifactId>kogito-addons-springboot-process-management</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>org.kie.kogito</groupId>
 diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-persistence-common/src/test/java/org/kie/kogito/it/PersistenceTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-persistence-common/src/test/java/org/kie/kogito/it/PersistenceTest.java
 index 95775d9a7c..587345f7d8 100644
 --- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-persistence-common/src/test/java/org/kie/kogito/it/PersistenceTest.java
@@ -102,21 +120,8 @@ index 95775d9a7c..587345f7d8 100644
 
  import io.restassured.RestAssured;
  import io.restassured.http.ContentType;
-diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml
-index c102fb4ad1..a88279c998 100644
---- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml
-+++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml
-@@ -39,7 +39,7 @@
-     </dependency>
-     <dependency>
-       <groupId>org.infinispan</groupId>
--      <artifactId>infinispan-spring-boot-starter-remote</artifactId>
-+      <artifactId>infinispan-spring-boot3-starter-remote</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.kie.kogito</groupId>
 diff --git a/springboot/starters/kogito-processes-spring-boot-starter/pom.xml b/springboot/starters/kogito-processes-spring-boot-starter/pom.xml
-index 50d94366c4..fc38799953 100644
+index 9eed010a53..627c1085c3 100644
 --- a/springboot/starters/kogito-processes-spring-boot-starter/pom.xml
 +++ b/springboot/starters/kogito-processes-spring-boot-starter/pom.xml
 @@ -22,6 +22,10 @@
@@ -127,7 +132,6 @@ index 50d94366c4..fc38799953 100644
 +      <groupId>org.reactivestreams</groupId>
 +      <artifactId>reactive-streams</artifactId>
 +    </dependency>
-   </dependencies>
-
- </project>
-\ No newline at end of file
+     <dependency>
+       <groupId>org.springframework.security</groupId>
+       <artifactId>spring-security-core</artifactId>
diff --git a/.ci/environments/quarkus-3/project-recipe.yml b/.ci/environments/quarkus-3/project-recipe.yml
@@ -46,13 +46,17 @@ recipeList:
   # Quarkiverse versions
   - org.openrewrite.maven.ChangePropertyValue:
       key: version.io.quarkiverse.openapi.generator
-      newValue: 2.2.2
+      newValue: 2.2.8
   - org.openrewrite.maven.ChangePropertyValue:
       key: version.io.quarkiverse.asyncapi
-      newValue: 0.1.0
+      newValue: 0.2.0
+  - org.openrewrite.java.ChangePackage: # This change goes with the quarkiverse asyncapi version update
+      oldPackageName: com.asyncapi.v2.model
+      newPackageName: com.asyncapi.v2._6_0.model
+      recursive: true
   - org.openrewrite.maven.ChangePropertyValue:
       key: version.io.quarkiverse.reactivemessaging.http
-      newValue: 2.0.1
+      newValue: 2.0.2
   - org.openrewrite.maven.ChangePropertyValue:
       key: version.io.quarkiverse.jackson-jq
       newValue: 2.0.1
@@ -68,11 +72,6 @@ recipeList:
   - org.openrewrite.maven.ChangePropertyValue:
       key: version.org.infinispan
       newValue: 14.0.7.Final
-  - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
-      oldGroupId: org.infinispan
-      oldArtifactId: infinispan-core
-      newGroupId: org.infinispan
-      newArtifactId: infinispan-core-jakarta
   - org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId:
       oldGroupId: org.infinispan
       oldArtifactId: infinispan-core

diff --git a/.ci/environments/quarkus-3/quarkus3.yml b/.ci/environments/quarkus-3/quarkus3.yml
@@ -93,15 +93,20 @@ recipeList:
   }
 - org.openrewrite.maven.ChangePropertyValue: {
     key: version.io.quarkiverse.openapi.generator,
-    newValue: 2.2.2
+    newValue: 2.2.8
   }
 - org.openrewrite.maven.ChangePropertyValue: {
     key: version.io.quarkiverse.asyncapi,
-    newValue: 0.1.0
+    newValue: 0.2.0
+  }
+- org.openrewrite.java.ChangePackage: {
+    oldPackageName: com.asyncapi.v2.model,
+    newPackageName: com.asyncapi.v2._6_0.model,
+    recursive: true
   }
 - org.openrewrite.maven.ChangePropertyValue: {
     key: version.io.quarkiverse.reactivemessaging.http,
-    newValue: 2.0.1
+    newValue: 2.0.2
   }
 - org.openrewrite.maven.ChangePropertyValue: {
     key: version.io.quarkiverse.jackson-jq,
@@ -118,12 +123,6 @@ recipeList:
     key: version.org.infinispan,
     newValue: 14.0.7.Final
   }
-- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: {
-    oldGroupId: org.infinispan,
-    oldArtifactId: infinispan-core,
-    newGroupId: org.infinispan,
-    newArtifactId: infinispan-core-jakarta
-  }
 - org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId: {
     oldGroupId: org.infinispan,
     oldArtifactId: infinispan-core,