Quarkus 3: corrected patch

.ci/environments/quarkus-3/patches/0001_before_sh.patch

@@ -330,7 +330,7 @@ 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 4173d8cd80..3d7a550a92 100644
+index 4173d8cd80..8cdb515b46 100644
 --- a/kogito-build/kogito-dependencies-bom/pom.xml
 +++ b/kogito-build/kogito-dependencies-bom/pom.xml
 @@ -16,9 +16,9 @@
@@ -391,8 +391,7 @@ index 4173d8cd80..3d7a550a92 100644
 +    <version.io.micrometer>1.10.5</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>
-+    <version.io.serverlessworkflow>4.0.3.Final</version.io.serverlessworkflow>
+     <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>

.ci/environments/quarkus-3/patches/0004_javax.enterprise_to_jakarta.enterprise.patch

@@ -1,9 +1,3 @@
-commit ab7f929c80c55efa0d0151d97225c0348f97d5ce
-Author: radtriste <[email protected]>
-Date:   Tue Apr 18 14:57:52 2023 +0200
-
-    patch: javax.enterprise -> jakarta.enterprise
-
 diff --git a/kogito-codegen-modules/GUIDELINES.adoc b/kogito-codegen-modules/GUIDELINES.adoc
 index ae862535a4..a8ad497c5d 100644
 --- a/kogito-codegen-modules/GUIDELINES.adoc
@@ -27,7 +21,7 @@ index ae862535a4..a8ad497c5d 100644
      });
  ----
 diff --git a/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/impl/CDIDependencyInjectionAnnotator.java b/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/impl/CDIDependencyInjectionAnnotator.java
-index 54cef037a5..7f3857df63 100644
+index f06c26e151..27eb8803ca 100644
 --- a/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/impl/CDIDependencyInjectionAnnotator.java
 +++ b/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/impl/CDIDependencyInjectionAnnotator.java
 @@ -35,7 +35,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot
@@ -74,7 +68,7 @@ index 54cef037a5..7f3857df63 100644
 +        node.addAnnotation("jakarta.enterprise.inject.Produces");
          return node;
      }
- }
+
 diff --git a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/ApplicationQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/ApplicationQuarkusTemplate.java
 index 64bd6d374c..023cf9e482 100644
 --- a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/ApplicationQuarkusTemplate.java

.ci/environments/quarkus-3/patches/0016_update_dependencies_version.patch

@@ -1,28 +1,28 @@
 diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-dependencies-bom/pom.xml
-index 0bd087bac5..3cbd66b5c8 100644
+index 37608a0de9..b7087b7e44 100644
 --- a/kogito-build/kogito-dependencies-bom/pom.xml
 +++ b/kogito-build/kogito-dependencies-bom/pom.xml
-@@ -41,7 +41,7 @@
-     <version.com.github.tomakehurst.wiremock>2.33.2</version.com.github.tomakehurst.wiremock>
-     <version.com.google.protobuf>3.22.0</version.com.google.protobuf>
+@@ -42,7 +42,7 @@
+     <!-- We don't use gson directly. This is just to align versions of transitive dependencies -->
+     <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>
 +    <version.com.oracle.database.jdbc>21.5.0.0</version.com.oracle.database.jdbc>
      <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>2.0.0</version.com.sun.activation>
-@@ -56,8 +56,8 @@
+@@ -57,8 +57,8 @@
      <version.io.cloudevents>2.3.0</version.io.cloudevents>
      <version.io.fabric8.kubernetes-client>6.5.1</version.io.fabric8.kubernetes-client>
      <version.io.micrometer>1.10.5</version.io.micrometer>
 -    <version.org.flywaydb>9.8.3</version.org.flywaydb>
 -    <version.org.postgresql>42.5.1</version.org.postgresql>
 +    <version.org.flywaydb>9.16.3</version.org.flywaydb>
 +    <version.org.postgresql>42.6.0</version.org.postgresql>
-     <version.io.serverlessworkflow>4.0.3.Final</version.io.serverlessworkflow>
+     <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.3.2</version.io.smallrye-open-api>
-@@ -86,7 +86,7 @@
+@@ -87,7 +87,7 @@
      <version.org.keycloak>21.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>
@@ -31,7 +31,7 @@ index 0bd087bac5..3cbd66b5c8 100644
      <version.org.mongo-image>4.4.14</version.org.mongo-image>
      <version.org.mozilla.rhino>1.7.13</version.org.mozilla.rhino>
      <version.org.redis>2.0.4</version.org.redis>
-@@ -95,7 +95,7 @@
+@@ -96,7 +96,7 @@
      <version.org.assertj>3.22.0</version.org.assertj>
      <version.org.json-unit-assertj>2.9.0</version.org.json-unit-assertj>
      <version.org.hamcrest>1.3</version.org.hamcrest> <!-- else old version coming from Mockito wins and breaks tests -->
@@ -40,7 +40,7 @@ index 0bd087bac5..3cbd66b5c8 100644
      <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>
-@@ -111,13 +111,13 @@
+@@ -112,13 +112,13 @@
      <version.org.mvel>2.5.0.Final</version.org.mvel>
      <version.org.reactivestreams>1.0.4</version.org.reactivestreams>
      <version.org.reflections>0.10.2</version.org.reflections>

.ci/environments/quarkus-3/project-recipe.yml

@@ -32,9 +32,9 @@ recipeList:
       newValue: 21.0.1
   # TODO to update once sdk-java provides a library compatible with jakarta
   # cf https://github.com/serverlessworkflow/sdk-java/issues/225
-  - org.openrewrite.maven.ChangePropertyValue:
-      key: version.io.serverlessworkflow
-      newValue: 4.0.3.Final
+#   - org.openrewrite.maven.ChangePropertyValue:
+#       key: version.io.serverlessworkflow
+#       newValue: 4.0.4.Final
   - org.openrewrite.maven.ChangePropertyValue:
       key: version.com.github.javaparser
       newValue: 3.25.1

.ci/environments/quarkus-3/quarkus3.yml

@@ -83,10 +83,6 @@ recipeList:
     key: version.org.keycloak,
     newValue: 21.0.1
   }
-- org.openrewrite.maven.ChangePropertyValue: {
-    key: version.io.serverlessworkflow,
-    newValue: 4.0.3.Final
-  }
 - org.openrewrite.maven.ChangePropertyValue: {
     key: version.com.github.javaparser,
     newValue: 3.25.1
@@ -147,7 +143,6 @@ recipeList:
     newArtifactId: infinispan-client-hotrod-jakarta
   }
 ---
-displayName: Update Managed Dependencies
 recipeList:
 - org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId: {
     oldGroupId: javax.activation,
@@ -532,9 +527,10 @@ recipeList:
     newGroupId: org.keycloak,
     newArtifactId: keycloak-admin-client-jakarta
   }
-type: specs.openrewrite.org/v1beta/recipe
-description: Update all managed dependencies based on dependency updates from Quarkus.
+displayName: Update Managed Dependencies
 name: org.kie.ManagedDependencies
+description: Update all managed dependencies based on dependency updates from Quarkus.
+type: specs.openrewrite.org/v1beta/recipe
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: io.quarkus.updates.core.quarkus30.UpgradeQuarkiverse