[Quarkus 3] Updated rewrite data

apache · Aug 23, 2023 · 20e3213 · 20e3213
1 parent b220d51
commit 20e3213
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 7 deletions.
diff --git a/.ci/environments/quarkus-3/patches/0001_before_sh.patch b/.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 1a84ef62e0..5dc632ab64 100644
+index 99b9c2301a..5dc632ab64 100644
 --- a/kogito-build/kogito-dependencies-bom/pom.xml
 +++ b/kogito-build/kogito-dependencies-bom/pom.xml
 @@ -16,9 +16,9 @@
@@ -350,7 +350,7 @@ index 1a84ef62e0..5dc632ab64 100644
      <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>
 -    <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.openapi.generator>1.3.9</version.io.quarkiverse.openapi.generator>
 -    <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>
@@ -1830,6 +1830,47 @@ index d6618e0ffd..1e820b4df2 100644
 
  import org.kie.kogito.addon.quarkus.messaging.common.AbstractQuarkusCloudEventReceiver;
  import org.kie.kogito.config.ConfigBean;
+diff --git a/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml b/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml
+index 0de7a857aa..96777ed600 100644
+--- a/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml
++++ b/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml
+@@ -47,7 +47,7 @@
+         <plugins>
+             <plugin>
+                 <groupId>io.quarkus</groupId>
+-                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
++                <artifactId>quarkus-extension-maven-plugin</artifactId>
+                 <version>${version.io.quarkus}</version>
+                 <executions>
+                     <execution>
+diff --git a/quarkus/addons/microprofile-config-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalog.java b/quarkus/addons/microprofile-config-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalog.java
+index 620f1632d8..15bb77b9dd 100644
+--- a/quarkus/addons/microprofile-config-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalog.java
++++ b/quarkus/addons/microprofile-config-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalog.java
+@@ -18,8 +18,8 @@ package org.kie.kogito.addons.quarkus.microprofile.config.service.catalog;
+ import java.net.URI;
+ import java.util.Optional;
+
+-import javax.enterprise.context.ApplicationScoped;
+-import javax.inject.Inject;
++import jakarta.enterprise.context.ApplicationScoped;
++import jakarta.inject.Inject;
+
+ import org.eclipse.microprofile.config.Config;
+ import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog;
+diff --git a/quarkus/addons/microprofile-config-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalogTest.java b/quarkus/addons/microprofile-config-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalogTest.java
+index 28f7abe736..7ac841fb71 100644
+--- a/quarkus/addons/microprofile-config-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalogTest.java
++++ b/quarkus/addons/microprofile-config-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalogTest.java
+@@ -15,7 +15,7 @@
+  */
+ package org.kie.kogito.addons.quarkus.microprofile.config.service.catalog;
+
+-import javax.inject.Inject;
++import jakarta.inject.Inject;
+
+ import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalogTest;
+
 diff --git a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusEventListenerFactory.java b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusEventListenerFactory.java
 index c0dc15fd1d..478cd757c5 100644
 --- a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusEventListenerFactory.java
@@ -3663,15 +3704,17 @@ index 4940e8a246..7be51afdd0 100644
  import org.drools.codegen.common.GeneratedFile;
  import org.drools.codegen.common.GeneratedFileType;
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java
-index 310ed2cfdf..8d5c291d24 100644
+index 06d572ada9..312b1b7fc7 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java
-@@ -19,7 +19,7 @@ import java.lang.annotation.Annotation;
+@@ -19,8 +19,8 @@ import java.lang.annotation.Annotation;
  import java.util.Map;
  import java.util.stream.Stream;
 
 -import javax.enterprise.context.ApplicationScoped;
+-import javax.ws.rs.core.Response;
 +import jakarta.enterprise.context.ApplicationScoped;
++import jakarta.ws.rs.core.Response;
 
  import org.jboss.jandex.AnnotationInstance;
  import org.jboss.jandex.ClassInfo;

diff --git a/.ci/environments/quarkus-3/quarkus3.yml b/.ci/environments/quarkus-3/quarkus3.yml
@@ -142,9 +142,6 @@ recipeList:
     newArtifactId: infinispan-client-hotrod-jakarta
   }
 ---
-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
 recipeList:
 - org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId: {
@@ -530,6 +527,9 @@ recipeList:
     newGroupId: org.keycloak,
     newArtifactId: keycloak-admin-client-jakarta
   }
+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
 name: io.quarkus.updates.core.quarkus30.UpgradeQuarkiverse