Skip to content

Commit 7ab2fa0

Browse files
author
Jenkins CI
committed
[Quarkus 3] Updated rewrite data
1 parent db2e6fc commit 7ab2fa0

File tree

2 files changed

+17
-111
lines changed

2 files changed

+17
-111
lines changed

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

Lines changed: 13 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,10 +1318,10 @@ index 4153a39970..dd02bb5268 100644
13181318
import org.eclipse.microprofile.health.HealthCheck;
13191319
import org.eclipse.microprofile.health.HealthCheckResponse;
13201320
diff --git a/quarkus/addons/knative/serving/runtime/pom.xml b/quarkus/addons/knative/serving/runtime/pom.xml
1321-
index f57d7658ba..2661b409d8 100644
1321+
index d5919b1d46..a6c31368b4 100644
13221322
--- a/quarkus/addons/knative/serving/runtime/pom.xml
13231323
+++ b/quarkus/addons/knative/serving/runtime/pom.xml
1324-
@@ -81,7 +81,7 @@
1324+
@@ -94,7 +94,7 @@
13251325
<plugins>
13261326
<plugin>
13271327
<groupId>io.quarkus</groupId>
@@ -1330,71 +1330,6 @@ index f57d7658ba..2661b409d8 100644
13301330
<version>${version.io.quarkus}</version>
13311331
<executions>
13321332
<execution>
1333-
diff --git a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/CloudEventKnativeServiceRequestClient.java b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/CloudEventKnativeServiceRequestClient.java
1334-
index 09d0df7cdf..29d493857c 100644
1335-
--- a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/CloudEventKnativeServiceRequestClient.java
1336-
+++ b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/CloudEventKnativeServiceRequestClient.java
1337-
@@ -21,10 +21,10 @@ import java.util.HashMap;
1338-
import java.util.Map;
1339-
import java.util.Optional;
1340-
1341-
-import javax.annotation.PreDestroy;
1342-
-import javax.enterprise.context.ApplicationScoped;
1343-
-import javax.inject.Inject;
1344-
+import jakarta.enterprise.context.ApplicationScoped;
1345-
+import jakarta.inject.Inject;
1346-
1347-
+import jakarta.annotation.PreDestroy;
1348-
import org.eclipse.microprofile.config.inject.ConfigProperty;
1349-
import org.kie.kogito.event.cloudevents.utils.CloudEventUtils;
1350-
import org.slf4j.Logger;
1351-
diff --git a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeServerlessWorkflowCustomFunction.java b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeServerlessWorkflowCustomFunction.java
1352-
index adf00518c6..344fbcd995 100644
1353-
--- a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeServerlessWorkflowCustomFunction.java
1354-
+++ b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeServerlessWorkflowCustomFunction.java
1355-
@@ -18,9 +18,9 @@ package org.kie.kogito.addons.quarkus.knative.serving.customfunctions;
1356-
import java.net.URI;
1357-
import java.util.Map;
1358-
1359-
-import javax.enterprise.context.ApplicationScoped;
1360-
-import javax.enterprise.inject.Instance;
1361-
-import javax.inject.Inject;
1362-
+import jakarta.enterprise.context.ApplicationScoped;
1363-
+import jakarta.enterprise.inject.Instance;
1364-
+import jakarta.inject.Inject;
1365-
1366-
import org.kie.kogito.addons.k8s.resource.catalog.DefaultKubernetesServiceCatalogFactory;
1367-
import org.kie.kogito.addons.k8s.resource.catalog.KubernetesProtocol;
1368-
diff --git a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeServiceRequestClientResolver.java b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeServiceRequestClientResolver.java
1369-
index 458a914716..da4c6009e3 100644
1370-
--- a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeServiceRequestClientResolver.java
1371-
+++ b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeServiceRequestClientResolver.java
1372-
@@ -15,8 +15,8 @@
1373-
*/
1374-
package org.kie.kogito.addons.quarkus.knative.serving.customfunctions;
1375-
1376-
-import javax.enterprise.context.ApplicationScoped;
1377-
-import javax.inject.Inject;
1378-
+import jakarta.enterprise.context.ApplicationScoped;
1379-
+import jakarta.inject.Inject;
1380-
1381-
@ApplicationScoped
1382-
class KnativeServiceRequestClientResolver {
1383-
diff --git a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandler.java b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandler.java
1384-
index d1a65e0487..39f51e465e 100644
1385-
--- a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandler.java
1386-
+++ b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandler.java
1387-
@@ -17,8 +17,8 @@ package org.kie.kogito.addons.quarkus.knative.serving.customfunctions;
1388-
1389-
import java.util.Map;
1390-
1391-
-import javax.enterprise.context.ApplicationScoped;
1392-
-import javax.inject.Inject;
1393-
+import jakarta.enterprise.context.ApplicationScoped;
1394-
+import jakarta.inject.Inject;
1395-
1396-
import org.kie.kogito.internal.process.runtime.KogitoWorkItem;
1397-
import org.kie.kogito.serverless.workflow.WorkflowWorkItemHandler;
13981333
diff --git a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerConfig.java b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerConfig.java
13991334
index e78681c3b8..74ec97bc65 100644
14001335
--- a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerConfig.java
@@ -1413,50 +1348,21 @@ index e78681c3b8..74ec97bc65 100644
14131348
import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig;
14141349

14151350
@ApplicationScoped
1416-
diff --git a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/PlainJsonKnativeServiceRequestClient.java b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/PlainJsonKnativeServiceRequestClient.java
1417-
index 1cd2b07fba..6cab0cd0e0 100644
1418-
--- a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/PlainJsonKnativeServiceRequestClient.java
1419-
+++ b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/PlainJsonKnativeServiceRequestClient.java
1420-
@@ -21,10 +21,10 @@ import java.util.List;
1421-
import java.util.Map;
1422-
import java.util.Optional;
1423-
1424-
-import javax.annotation.PreDestroy;
1425-
-import javax.enterprise.context.ApplicationScoped;
1426-
-import javax.inject.Inject;
1427-
+import jakarta.enterprise.context.ApplicationScoped;
1428-
+import jakarta.inject.Inject;
1429-
1430-
+import jakarta.annotation.PreDestroy;
1431-
import org.eclipse.microprofile.config.inject.ConfigProperty;
1432-
import org.kie.kogito.event.cloudevents.utils.CloudEventUtils;
1433-
import org.slf4j.Logger;
1434-
diff --git a/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/CloudEventKnativeServiceRequestClientTest.java b/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/CloudEventKnativeServiceRequestClientTest.java
1435-
index 98e2c18678..6bcb3bd7ef 100644
1436-
--- a/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/CloudEventKnativeServiceRequestClientTest.java
1437-
+++ b/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/CloudEventKnativeServiceRequestClientTest.java
1438-
@@ -19,7 +19,7 @@ import java.net.URI;
1439-
import java.util.HashMap;
1440-
import java.util.Map;
1441-
1442-
-import javax.inject.Inject;
1443-
+import jakarta.inject.Inject;
1444-
1445-
import org.assertj.core.api.Assertions;
1446-
import org.junit.jupiter.api.AfterAll;
1447-
diff --git a/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeServerlessWorkflowCustomFunctionTest.java b/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeServerlessWorkflowCustomFunctionTest.java
1448-
index 45344199c4..1971c08cb6 100644
1449-
--- a/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeServerlessWorkflowCustomFunctionTest.java
1450-
+++ b/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeServerlessWorkflowCustomFunctionTest.java
1451-
@@ -19,7 +19,7 @@ import java.time.Instant;
1452-
import java.util.List;
1453-
import java.util.Map;
1351+
diff --git a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java
1352+
index 3e88d6676e..cdd89c7698 100644
1353+
--- a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java
1354+
+++ b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java
1355+
@@ -15,8 +15,8 @@
1356+
*/
1357+
package org.kie.kogito.addons.quarkus.knative.serving.customfunctions;
14541358

1359+
-import javax.enterprise.inject.Produces;
14551360
-import javax.inject.Inject;
1361+
+import jakarta.enterprise.inject.Produces;
14561362
+import jakarta.inject.Inject;
14571363

1458-
import org.eclipse.microprofile.config.inject.ConfigProperty;
1459-
import org.junit.jupiter.api.AfterAll;
1364+
import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog;
1365+
import org.kogito.workitem.rest.RestWorkItemHandlerUtils;
14601366
diff --git a/quarkus/addons/kubernetes/deployment/src/test/java/org/kie/kogito/addons/quarkus/kubernetes/KubernetesAddOnTest.java b/quarkus/addons/kubernetes/deployment/src/test/java/org/kie/kogito/addons/quarkus/kubernetes/KubernetesAddOnTest.java
14611367
index e1549df41b..77a4491cbd 100644
14621368
--- a/quarkus/addons/kubernetes/deployment/src/test/java/org/kie/kogito/addons/quarkus/kubernetes/KubernetesAddOnTest.java

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,7 @@ recipeList:
142142
newArtifactId: infinispan-client-hotrod-jakarta
143143
}
144144
---
145-
name: org.kie.ManagedDependencies
146-
description: Update all managed dependencies based on dependency updates from Quarkus.
147-
type: specs.openrewrite.org/v1beta/recipe
145+
displayName: Update Managed Dependencies
148146
recipeList:
149147
- org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId: {
150148
oldGroupId: javax.activation,
@@ -529,7 +527,9 @@ recipeList:
529527
newGroupId: org.keycloak,
530528
newArtifactId: keycloak-admin-client-jakarta
531529
}
532-
displayName: Update Managed Dependencies
530+
type: specs.openrewrite.org/v1beta/recipe
531+
description: Update all managed dependencies based on dependency updates from Quarkus.
532+
name: org.kie.ManagedDependencies
533533
---
534534
type: specs.openrewrite.org/v1beta/recipe
535535
name: io.quarkus.updates.core.quarkus30.UpgradeQuarkiverse

0 commit comments

Comments
 (0)