diff --git a/.ci/environments/quarkus-3/before.sh b/.ci/environments/quarkus-3/before.sh index aeda81b1915..f5dddd7bb7e 100755 --- a/.ci/environments/quarkus-3/before.sh +++ b/.ci/environments/quarkus-3/before.sh @@ -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.9.Final} quarkus_recipe_file="${script_dir_path}/quarkus3.yml" patch_file="${script_dir_path}"/patches/0001_before_sh.patch diff --git a/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java b/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java index ef4a67020b2..9f4f3842ecd 100755 --- a/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java +++ b/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java @@ -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.9.Final //DEPS info.picocli:picocli:4.5.0 /* @@ -45,7 +45,7 @@ class CreateKieQuarkusProjectMigrationRecipeCli implements Callable { @Option(names={ "-v", "--property-version"}, description = "(multi). Add a dynamic property version to the final recipe") private Map versionProperties = new HashMap<>(); - static final String QUARKUS_UPDATES_BASE_URL = "https://raw.githubusercontent.com/quarkusio/quarkus-updates/1.0.0/recipes/src/main/resources/quarkus-updates/core/3alpha.yaml"; + static final String QUARKUS_UPDATES_BASE_URL = "https://github.com/quarkusio/quarkus-updates/blob/main/recipes/src/main/resources/quarkus-updates/core/3.2.yaml"; static final Path quarkus3DownloadedRecipePath = Paths.get("quarkus3-base-recipe.yml"); static final Path quarkus3GeneratedRecipePath = Paths.get("quarkus3.yml"); diff --git a/.ci/environments/quarkus-3/patches/0001_before_sh.patch b/.ci/environments/quarkus-3/patches/0001_before_sh.patch index a4c6e8f05a5..dbfc77f1314 100644 --- a/.ci/environments/quarkus-3/patches/0001_before_sh.patch +++ b/.ci/environments/quarkus-3/patches/0001_before_sh.patch @@ -1,8 +1,8 @@ diff --git a/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java b/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java -index e62f05047a..28c4533641 100644 +index 982afe1739..6db25dad1d 100644 --- a/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java +++ b/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java -@@ -18,8 +18,8 @@ package org.kie.kogito.jobs.api; +@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.api; import java.time.temporal.ChronoUnit; @@ -14,10 +14,10 @@ index e62f05047a..28c4533641 100644 import org.kie.kogito.jobs.ProcessInstanceJobDescription; import org.kie.kogito.jobs.service.api.TemporalUnit; diff --git a/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java b/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java -index ebc9d7f80b..b877b40ce6 100644 +index b1ca3a73db..99f1add2b7 100644 --- a/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java +++ b/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java -@@ -18,8 +18,8 @@ package org.kie.kogito.jobs.api; +@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.api; import java.net.URI; @@ -29,10 +29,10 @@ index ebc9d7f80b..b877b40ce6 100644 import org.junit.jupiter.api.Test; import org.kie.kogito.jobs.ExactExpirationTime; diff --git a/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java b/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java -index 827d4f53c1..6698791988 100644 +index 9729b0ccdd..d775e7eacb 100644 --- a/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java +++ b/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java -@@ -23,8 +23,8 @@ import java.util.List; +@@ -26,8 +26,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -44,10 +44,10 @@ index 827d4f53c1..6698791988 100644 import org.kie.api.runtime.process.WorkItem; import org.kie.kogito.addons.k8s.Endpoint; diff --git a/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java b/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java -index 3ef249edfe..5b317809a4 100644 +index 688c4cf7a0..5eb93c71d2 100644 --- a/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java +++ b/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java -@@ -17,7 +17,7 @@ package org.kie.kogito.addons.k8s.workitems; +@@ -20,7 +20,7 @@ package org.kie.kogito.addons.k8s.workitems; import java.util.Map; @@ -57,10 +57,10 @@ index 3ef249edfe..5b317809a4 100644 import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/addons/common/persistence/infinispan/pom.xml b/addons/common/persistence/infinispan/pom.xml -index a7220d09ea..9d64d395be 100644 +index b30b289b84..6402b5d06d 100644 --- a/addons/common/persistence/infinispan/pom.xml +++ b/addons/common/persistence/infinispan/pom.xml -@@ -29,9 +29,9 @@ +@@ -49,9 +49,9 @@ process-serialization-protobuf @@ -73,10 +73,10 @@ index a7220d09ea..9d64d395be 100644 diff --git a/api/kogito-api/pom.xml b/api/kogito-api/pom.xml -index 85c613d88b..c48d871ad5 100755 +index 68bd620d55..ea90fd825f 100755 --- a/api/kogito-api/pom.xml +++ b/api/kogito-api/pom.xml -@@ -38,9 +38,10 @@ +@@ -58,9 +58,10 @@ @@ -85,15 +85,15 @@ index 85c613d88b..c48d871ad5 100755 + jakarta.xml.bind + jakarta.xml.bind-api provided -+ 4.0.0 ++ 4.0.1 diff --git a/jbpm/jbpm-bpmn2/pom.xml b/jbpm/jbpm-bpmn2/pom.xml -index 92ba977bbd..6e816b43da 100755 +index 3c7b009e86..09e26280de 100755 --- a/jbpm/jbpm-bpmn2/pom.xml +++ b/jbpm/jbpm-bpmn2/pom.xml -@@ -54,9 +54,10 @@ +@@ -74,9 +74,10 @@ @@ -102,11 +102,11 @@ index 92ba977bbd..6e816b43da 100755 + jakarta.xml.bind + jakarta.xml.bind-api provided -+ 4.0.0 ++ 4.0.1 com.sun.xml.bind -@@ -64,13 +65,14 @@ +@@ -84,13 +85,14 @@ provided @@ -115,7 +115,7 @@ index 92ba977bbd..6e816b43da 100755 + org.glassfish.jaxb + jaxb-runtime provided -+ 4.0.3 ++ 4.0.4 - - com.sun.activation @@ -143,10 +143,10 @@ index c9cd63d032..f81811971d 100755 org.hibernate.jpa.HibernatePersistenceProvider diff --git a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Address.java b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Address.java -index c09c1f2e9f..107b9a3fd9 100755 +index fe3ca2c91b..fd9d2eecda 100755 --- a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Address.java +++ b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Address.java -@@ -17,7 +17,7 @@ package org.jbpm.bpmn2.objects; +@@ -20,7 +20,7 @@ package org.jbpm.bpmn2.objects; import java.io.Serializable; @@ -156,10 +156,10 @@ index c09c1f2e9f..107b9a3fd9 100755 @XmlRootElement public class Address implements Serializable { diff --git a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/NotAvailableGoodsReport.java b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/NotAvailableGoodsReport.java -index 2675520841..7cc238935e 100755 +index 8978dee9e8..fb1a4feb6e 100755 --- a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/NotAvailableGoodsReport.java +++ b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/NotAvailableGoodsReport.java -@@ -15,7 +15,7 @@ +@@ -18,7 +18,7 @@ */ package org.jbpm.bpmn2.objects; @@ -169,10 +169,10 @@ index 2675520841..7cc238935e 100755 static final long serialVersionUID = 1L; diff --git a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Person.java b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Person.java -index 6bdc9a9cd8..4356b256e6 100755 +index a299263f2d..1569635826 100755 --- a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Person.java +++ b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Person.java -@@ -17,7 +17,7 @@ package org.jbpm.bpmn2.objects; +@@ -20,7 +20,7 @@ package org.jbpm.bpmn2.objects; import java.io.Serializable; @@ -182,10 +182,10 @@ index 6bdc9a9cd8..4356b256e6 100755 @XmlRootElement(name = "person") public class Person implements Serializable { diff --git a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java -index e93c007f1e..d584c3f0c9 100755 +index b106025632..a3288e3c8c 100755 --- a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java +++ b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java -@@ -19,8 +19,8 @@ import java.io.StringReader; +@@ -22,8 +22,8 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Map; @@ -197,10 +197,10 @@ index e93c007f1e..d584c3f0c9 100755 import org.jbpm.bpmn2.JbpmBpmn2TestCase; import org.jbpm.bpmn2.objects.Person; diff --git a/jbpm/jbpm-flow/pom.xml b/jbpm/jbpm-flow/pom.xml -index bace24ddfa..b75ab0c3dc 100755 +index ebf4574103..e220b3869f 100755 --- a/jbpm/jbpm-flow/pom.xml +++ b/jbpm/jbpm-flow/pom.xml -@@ -86,9 +86,10 @@ +@@ -106,9 +106,10 @@ @@ -209,15 +209,15 @@ index bace24ddfa..b75ab0c3dc 100755 + jakarta.xml.bind + jakarta.xml.bind-api provided -+ 4.0.0 ++ 4.0.1 diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java -index e34727d2af..8461c27468 100755 +index effad1e786..4bb7c5e332 100755 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java -@@ -15,10 +15,10 @@ +@@ -18,10 +18,10 @@ */ package org.jbpm.process.instance.command; @@ -233,10 +233,10 @@ index e34727d2af..8461c27468 100755 import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java -index 33b41f53d9..10aad0b0cf 100755 +index 7bd2f26967..79e342bd84 100755 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java -@@ -18,11 +18,11 @@ package org.jbpm.process.instance.command; +@@ -21,11 +21,11 @@ package org.jbpm.process.instance.command; import java.util.HashMap; import java.util.Map; @@ -254,10 +254,10 @@ index 33b41f53d9..10aad0b0cf 100755 import org.drools.core.common.InternalKnowledgeRuntime; import org.jbpm.workflow.core.impl.NodeImpl; diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java -index 867be63fec..f146f410c0 100755 +index fd4450262c..6cc16653bf 100755 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java -@@ -15,11 +15,11 @@ +@@ -18,11 +18,11 @@ */ package org.jbpm.process.instance.command; @@ -275,10 +275,10 @@ index 867be63fec..f146f410c0 100755 import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java -index 21008bfcc2..03f0b63095 100755 +index 37f849d908..2f2d069a4d 100755 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java -@@ -15,11 +15,11 @@ +@@ -18,11 +18,11 @@ */ package org.jbpm.process.instance.command; @@ -296,10 +296,10 @@ index 21008bfcc2..03f0b63095 100755 import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java -index 42d82935f9..157ad57d4b 100755 +index c7b676986f..b5f8b6d6cb 100755 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java -@@ -15,11 +15,11 @@ +@@ -18,11 +18,11 @@ */ package org.jbpm.process.instance.command; @@ -317,10 +317,10 @@ index 42d82935f9..157ad57d4b 100755 import org.jbpm.process.instance.impl.ProcessInstanceImpl; import org.kie.api.command.ExecutableCommand; diff --git a/kogito-build/kogito-build-no-bom-parent/pom.xml b/kogito-build/kogito-build-no-bom-parent/pom.xml -index 914a5ed1a5..840df84c51 100644 +index 30d4121411..18a30b1792 100644 --- a/kogito-build/kogito-build-no-bom-parent/pom.xml +++ b/kogito-build/kogito-build-no-bom-parent/pom.xml -@@ -619,7 +619,7 @@ +@@ -639,7 +639,7 @@ io.quarkus @@ -330,27 +330,31 @@ index 914a5ed1a5..840df84c51 100644 diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-dependencies-bom/pom.xml -index b5586ee40a..ac8b59bb73 100644 +index f2ba6467f3..0521832c93 100644 --- a/kogito-build/kogito-dependencies-bom/pom.xml +++ b/kogito-build/kogito-dependencies-bom/pom.xml -@@ -16,9 +16,9 @@ +@@ -16,76 +16,76 @@ -- 2.16.10.Final -+ 3.0.0.Final +- 2.16.12.Final ++ 3.2.9.Final ${version.io.quarkus} - 2.6.6 + 3.0.5 3.4.0 -@@ -28,48 +28,48 @@ + 1.0.86 +- 2.14.2 +- 2.14.2 ++ 2.15.2 ++ 2.15.2 2.8.0 2.4.10 1.0.0-preview.20220705 - 1.1.0 -- 1.3.9 +- 1.3.10 - 0.0.6 - 1.1.5 + 2.0.1 @@ -360,8 +364,9 @@ index b5586ee40a..ac8b59bb73 100644 0.0.9 1.5.2 - 3.24.2 +- 2.14.2 + 3.25.1 - 2.14.2 ++ 2.15.2 4.18.0 2.33.2 3.22.0 @@ -373,7 +378,7 @@ index b5586ee40a..ac8b59bb73 100644 2.3.0.1 2.3.5 - 1.2.0 -+ 2.0.0 ++ 2.0.1 1.3.2 1.3.2 1 @@ -381,42 +386,45 @@ index b5586ee40a..ac8b59bb73 100644 2.3.1 - 2.0.1 - 1.2.9 -+ 3.1 ++ 3.1.1 + 1.4.7 2.3.0 - 6.3.1 - 1.10.2 -+ 6.5.1 -+ 1.10.5 ++ 6.7.2 ++ 1.11.1 9.8.3 42.5.1 - 4.0.4.Final + 4.0.5.Final - 3.1.1 -+ 3.3.2 ++ 3.4.0 4.2.0 - 2.30.1 -+ 3.2.0 ++ 3.7.2 - 4.3.7 +- 4.3.7 - 1.53.0 -+ 1.54.0 ++ 4.4.6 ++ 1.56.0 - 2.15.0 + 3.0.0-M1 - 2.0.26 + 2.1.16 + 2.2.14 -@@ -77,14 +77,14 @@ + 3.12.0 - 22.3.0 +- 22.3.0 ++ 23.0.1 - 14.0.6.Final - 4.5.1.Final + 14.0.7.Final -+ 4.6.1.Final ++ 4.6.2.Final 7.10.2 @@ -424,23 +432,30 @@ index b5586ee40a..ac8b59bb73 100644 - 4.7.7.Final - 20.0.2 + 3.1.0 -+ 6.2.1.Final ++ 6.2.4.Final + 21.0.1 2.12-2.2.1 4.6.1 -@@ -102,20 +102,20 @@ - 5.9.2 - 1.9.2 +@@ -99,24 +99,24 @@ + 1.3 + 8.2 + 5.${version.org.junit.minor} +- 5.9.2 +- 5.9.2 +- 1.9.2 ++ 5.9.3 ++ 5.9.3 ++ 1.9.3 1.5.0 -- 4.11.0 -+ 5.2.0 + 4.11.0 1.17.6 2.9.1 - 4.5.1 -+ 5.3.1 ++ 5.3.2 - 1.12.18 +- 1.12.18 ++ 1.14.7 2.5.0.Final - 1.0.3 @@ -450,21 +465,21 @@ index b5586ee40a..ac8b59bb73 100644 - 3.8.6 - 3.6.0 -+ 3.9.1 ++ 3.9.3 + 3.7.1 3.2.0 1.6 -@@ -124,7 +124,7 @@ +@@ -125,7 +125,7 @@ 1.0-1 4.1.1 - 32.0.1-jre -+ 31.1-jre ++ 32.0.0-jre + 1.24.0 - -@@ -264,8 +264,8 @@ +@@ -273,8 +273,8 @@ ${version.com.fasterxml.jackson} @@ -475,7 +490,7 @@ index b5586ee40a..ac8b59bb73 100644 ${version.com.fasterxml.jackson} -@@ -275,7 +275,7 @@ +@@ -284,7 +284,7 @@ com.fasterxml.jackson.module @@ -484,7 +499,7 @@ index b5586ee40a..ac8b59bb73 100644 ${version.com.fasterxml.jackson} -@@ -555,9 +555,9 @@ +@@ -564,9 +564,9 @@ @@ -497,7 +512,7 @@ index b5586ee40a..ac8b59bb73 100644 com.sun.xml.bind -@@ -565,19 +565,19 @@ +@@ -574,19 +574,19 @@ ${version.com.sun.xml.bind.core} @@ -506,7 +521,7 @@ index b5586ee40a..ac8b59bb73 100644 - ${version.com.sun.xml.bind.impl} + org.glassfish.jaxb + jaxb-runtime -+ 4.0.2 ++ 4.0.3 - com.sun.activation @@ -525,7 +540,7 @@ index b5586ee40a..ac8b59bb73 100644 javax.inject -@@ -585,9 +585,9 @@ +@@ -594,9 +594,9 @@ ${version.javax.inject} @@ -538,7 +553,7 @@ index b5586ee40a..ac8b59bb73 100644 org.eclipse.microprofile.openapi -@@ -633,7 +633,7 @@ +@@ -654,7 +654,7 @@ org.infinispan @@ -548,7 +563,7 @@ index b5586ee40a..ac8b59bb73 100644 diff --git a/kogito-build/kogito-kie-bom/pom.xml b/kogito-build/kogito-kie-bom/pom.xml -index 715dbf66c8..17a69d138e 100644 +index a900ed54a3..5e95b011b4 100644 --- a/kogito-build/kogito-kie-bom/pom.xml +++ b/kogito-build/kogito-kie-bom/pom.xml @@ -18,7 +18,7 @@ @@ -561,10 +576,10 @@ index 715dbf66c8..17a69d138e 100644 diff --git a/kogito-codegen-modules/kogito-codegen-processes/pom.xml b/kogito-codegen-modules/kogito-codegen-processes/pom.xml -index d7cf272966..27e823f66d 100644 +index 6029d9bae8..ae1e860a0b 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/pom.xml +++ b/kogito-codegen-modules/kogito-codegen-processes/pom.xml -@@ -97,9 +97,10 @@ +@@ -117,9 +117,10 @@ test @@ -573,15 +588,14 @@ index d7cf272966..27e823f66d 100644 + jakarta.validation + jakarta.validation-api test -+ 3.0.2 diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/data/HelloModel.java b/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/data/HelloModel.java -index 37649b0a2c..275181529a 100644 +index 4b58ec25ba..3ef8eabe81 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/data/HelloModel.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/data/HelloModel.java -@@ -35,7 +35,7 @@ public class HelloModel implements Model, MapInput, MapInputId, MapOutput { +@@ -38,7 +38,7 @@ public class HelloModel implements Model, MapInput, MapInputId, MapOutput { @org.kie.kogito.codegen.VariableInfo(tags = "") @com.fasterxml.jackson.annotation.JsonProperty(value = "person") @@ -590,7 +604,7 @@ index 37649b0a2c..275181529a 100644 private Person person; public Person getPerson() { -@@ -48,7 +48,7 @@ public class HelloModel implements Model, MapInput, MapInputId, MapOutput { +@@ -51,7 +51,7 @@ public class HelloModel implements Model, MapInput, MapInputId, MapOutput { @org.kie.kogito.codegen.VariableInfo(tags = "") @com.fasterxml.jackson.annotation.JsonProperty(value = "var2") @@ -599,7 +613,7 @@ index 37649b0a2c..275181529a 100644 private String var2; public String getVar2() { -@@ -61,7 +61,7 @@ public class HelloModel implements Model, MapInput, MapInputId, MapOutput { +@@ -64,7 +64,7 @@ public class HelloModel implements Model, MapInput, MapInputId, MapOutput { @org.kie.kogito.codegen.VariableInfo(tags = "") @com.fasterxml.jackson.annotation.JsonProperty(value = "var1") @@ -609,10 +623,10 @@ index 37649b0a2c..275181529a 100644 public String getVar1() { diff --git a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java -index ba7c3c6366..e5051b4a5e 100644 +index 55a94a42ae..f3a7c073bd 100644 --- a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java +++ b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java -@@ -18,11 +18,11 @@ package org.kie.kogito.addons.quarkus.camel.runtime; +@@ -21,11 +21,11 @@ package org.kie.kogito.addons.quarkus.camel.runtime; import java.util.Collections; import java.util.Map; @@ -629,10 +643,10 @@ index ba7c3c6366..e5051b4a5e 100644 import org.apache.camel.ProducerTemplate; import org.kie.kogito.internal.process.runtime.KogitoWorkItem; diff --git a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java -index 2da06ff74e..b76f6aa336 100644 +index 92e74b341e..e8858be001 100644 --- a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java +++ b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java -@@ -15,10 +15,10 @@ +@@ -18,10 +18,10 @@ */ package org.kie.kogito.addons.quarkus.camel.runtime; @@ -647,14 +661,10 @@ index 2da06ff74e..b76f6aa336 100644 @ApplicationScoped diff --git a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java -index edb289a8ee..2ce6d0582e 100644 +index fd6a0d07b4..6d3c573c6b 100644 --- a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java +++ b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java -@@ -15,13 +15,13 @@ - */ - package org.kie.kogito.addon.quarkus.common.reactive.messaging; - -+import jakarta.annotation.PostConstruct; +@@ -21,11 +21,11 @@ package org.kie.kogito.addon.quarkus.common.reactive.messaging; import java.util.Collection; import java.util.stream.Collectors; @@ -666,13 +676,43 @@ index edb289a8ee..2ce6d0582e 100644 +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; ++import jakarta.annotation.PostConstruct; + import org.eclipse.microprofile.reactive.messaging.Message; + + /** +diff --git a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java +index 4ff805195c..ec9a557dbc 100644 +--- a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java ++++ b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java +@@ -18,7 +18,7 @@ + */ + package org.kie.kogito.addon.quarkus.common.reactive.messaging.http; + +-import javax.ws.rs.core.HttpHeaders; ++import jakarta.ws.rs.core.HttpHeaders; + import org.eclipse.microprofile.reactive.messaging.Message; + import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecorator; +diff --git a/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java b/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java +index 72b4d3200a..56d82c3462 100644 +--- a/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java ++++ b/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java +@@ -21,8 +21,8 @@ package org.kie.kogito.addon.quarkus.messaging.common.message.http; + import java.util.Collections; + import java.util.Optional; + +-import javax.enterprise.inject.Produces; +-import javax.inject.Inject; ++import jakarta.enterprise.inject.Produces; ++import jakarta.inject.Inject; + import org.eclipse.microprofile.reactive.messaging.Message; + import org.junit.jupiter.api.Test; diff --git a/quarkus/addons/events/decisions/runtime/pom.xml b/quarkus/addons/events/decisions/runtime/pom.xml -index 8eb1c309cd..575ee45565 100644 +index f4258b1d32..099c4dba4a 100644 --- a/quarkus/addons/events/decisions/runtime/pom.xml +++ b/quarkus/addons/events/decisions/runtime/pom.xml -@@ -31,7 +31,7 @@ +@@ -51,7 +51,7 @@ io.quarkus @@ -682,10 +722,10 @@ index 8eb1c309cd..575ee45565 100644 diff --git a/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java b/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java -index 32da3571ba..e282deadbe 100644 +index e2a5255c05..fbd6dd44a9 100644 --- a/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java +++ b/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.eventdriven.decision; @@ -697,10 +737,10 @@ index 32da3571ba..e282deadbe 100644 import org.kie.kogito.config.ConfigBean; import org.kie.kogito.decision.DecisionModels; diff --git a/quarkus/addons/events/mongodb/runtime/pom.xml b/quarkus/addons/events/mongodb/runtime/pom.xml -index 5421d4a96e..1594de9f17 100644 +index 031919c65e..ff5f1c70c6 100644 --- a/quarkus/addons/events/mongodb/runtime/pom.xml +++ b/quarkus/addons/events/mongodb/runtime/pom.xml -@@ -69,7 +69,7 @@ +@@ -89,7 +89,7 @@ io.quarkus @@ -710,11 +750,11 @@ index 5421d4a96e..1594de9f17 100644 diff --git a/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java b/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java -index ed54ccd623..0314f29b7c 100644 +index acc045bf57..da585bf0b1 100644 --- a/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java +++ b/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java -@@ -16,10 +16,10 @@ - +@@ -18,10 +18,10 @@ + */ package org.kie.kogito.events.mongodb; -import javax.annotation.PostConstruct; @@ -728,10 +768,10 @@ index ed54ccd623..0314f29b7c 100644 import org.kie.kogito.mongodb.transaction.AbstractTransactionManager; diff --git a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java -index 8c973f4511..eabd6236a7 100644 +index ad167e7166..67a270cb3e 100644 --- a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java +++ b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java -@@ -18,7 +18,7 @@ package org.kie.kogito.events.mongodb; +@@ -20,7 +20,7 @@ package org.kie.kogito.events.mongodb; import java.util.List; @@ -741,11 +781,11 @@ index 8c973f4511..eabd6236a7 100644 import org.bson.Document; import org.bson.conversions.Bson; diff --git a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java -index 183341ce03..44ebd72cb1 100644 +index e00cebbfce..ad81feee51 100644 --- a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java +++ b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java -@@ -16,7 +16,7 @@ - +@@ -18,7 +18,7 @@ + */ package org.kie.kogito.events.mongodb; -import javax.enterprise.context.ApplicationScoped; @@ -754,11 +794,11 @@ index 183341ce03..44ebd72cb1 100644 import org.kie.kogito.mongodb.transaction.AbstractTransactionManager; diff --git a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java -index 2976a44a1e..a0ea0200a7 100644 +index 9d95cf4466..733fa74cfc 100644 --- a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java +++ b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java -@@ -16,7 +16,7 @@ - +@@ -18,7 +18,7 @@ + */ package org.kie.kogito.events.mongodb; -import javax.inject.Inject; @@ -767,10 +807,10 @@ index 2976a44a1e..a0ea0200a7 100644 import org.junit.jupiter.api.Test; import org.kie.kogito.mongodb.transaction.AbstractTransactionManager; diff --git a/quarkus/addons/events/predictions/runtime/pom.xml b/quarkus/addons/events/predictions/runtime/pom.xml -index caffff49de..4da6d6518d 100644 +index f74c628f89..7884ec294f 100644 --- a/quarkus/addons/events/predictions/runtime/pom.xml +++ b/quarkus/addons/events/predictions/runtime/pom.xml -@@ -31,7 +31,7 @@ +@@ -51,7 +51,7 @@ io.quarkus @@ -780,10 +820,10 @@ index caffff49de..4da6d6518d 100644 diff --git a/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java b/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java -index 1d0a6ec2a6..b5714777f2 100644 +index b1b9b3849b..bb8854515d 100644 --- a/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java +++ b/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.eventdriven.predictions; @@ -795,10 +835,10 @@ index 1d0a6ec2a6..b5714777f2 100644 import org.kie.kogito.config.ConfigBean; import org.kie.kogito.event.EventEmitter; diff --git a/quarkus/addons/events/process/runtime/pom.xml b/quarkus/addons/events/process/runtime/pom.xml -index c128d47b8e..6eedd46d9d 100644 +index 6f566021af..ffbd211d38 100644 --- a/quarkus/addons/events/process/runtime/pom.xml +++ b/quarkus/addons/events/process/runtime/pom.xml -@@ -68,7 +68,7 @@ +@@ -92,7 +92,7 @@ io.quarkus @@ -808,10 +848,10 @@ index c128d47b8e..6eedd46d9d 100644 diff --git a/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java b/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java -index 90e517d759..3eeb7c902e 100644 +index 225f55eb4e..e5510c58bc 100644 --- a/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java +++ b/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java -@@ -20,11 +20,11 @@ import java.util.Optional; +@@ -22,11 +22,11 @@ import java.util.Collection; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; @@ -824,14 +864,14 @@ index 90e517d759..3eeb7c902e 100644 +import jakarta.inject.Singleton; +import jakarta.annotation.PostConstruct; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.reactive.messaging.Channel; - import org.eclipse.microprofile.reactive.messaging.Emitter; + import org.eclipse.microprofile.reactive.messaging.Message; + import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecoratorProvider; diff --git a/quarkus/addons/events/rules/runtime/pom.xml b/quarkus/addons/events/rules/runtime/pom.xml -index 99b5870071..c74f928495 100644 +index 756fb2d4dd..5855e1cafc 100644 --- a/quarkus/addons/events/rules/runtime/pom.xml +++ b/quarkus/addons/events/rules/runtime/pom.xml -@@ -31,7 +31,7 @@ +@@ -51,7 +51,7 @@ io.quarkus @@ -841,10 +881,10 @@ index 99b5870071..c74f928495 100644 diff --git a/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java b/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java -index 777439455a..3337ba231d 100644 +index 4b34ff5589..1f261d8900 100644 --- a/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java +++ b/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.eventdriven.rules; @@ -856,10 +896,10 @@ index 777439455a..3337ba231d 100644 import org.kie.kogito.config.ConfigBean; import org.kie.kogito.event.EventEmitter; diff --git a/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java b/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java -index 6fbf975d41..9b3599f562 100644 +index c8e17b2846..dd02b78b17 100644 --- a/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java +++ b/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java -@@ -19,8 +19,8 @@ import java.util.HashMap; +@@ -22,8 +22,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; @@ -871,10 +911,10 @@ index 6fbf975d41..9b3599f562 100644 import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/quarkus/addons/explainability/runtime/pom.xml b/quarkus/addons/explainability/runtime/pom.xml -index 8fd4cfcc9e..ab80329157 100644 +index 703f894e52..4789686363 100644 --- a/quarkus/addons/explainability/runtime/pom.xml +++ b/quarkus/addons/explainability/runtime/pom.xml -@@ -65,7 +65,7 @@ +@@ -85,7 +85,7 @@ io.quarkus @@ -884,10 +924,10 @@ index 8fd4cfcc9e..ab80329157 100644 diff --git a/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java b/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java -index fac920d739..cdbc8756bc 100644 +index ae72a32581..1b3205e834 100644 --- a/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java +++ b/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java -@@ -17,13 +17,13 @@ package org.kie.kogito.explainability; +@@ -20,13 +20,13 @@ package org.kie.kogito.explainability; import java.util.List; @@ -909,10 +949,10 @@ index fac920d739..cdbc8756bc 100644 import org.kie.kogito.Application; import org.kie.kogito.explainability.model.PredictInput; diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml -index 4cf954e2df..02a3964c18 100644 +index 55d400e440..52224a65e5 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml -@@ -77,7 +77,7 @@ +@@ -97,7 +97,7 @@ io.quarkus @@ -922,10 +962,10 @@ index 4cf954e2df..02a3964c18 100644 diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java -index cd3dc1e86d..177be0b153 100644 +index 5aba7abd79..1ed2dc4ae9 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java -@@ -21,8 +21,8 @@ import java.util.Optional; +@@ -24,8 +24,8 @@ import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; @@ -937,10 +977,10 @@ index cd3dc1e86d..177be0b153 100644 import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog; import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalogKey; diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java -index 609b486015..a76022a325 100644 +index 104e80d302..9660edf455 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java -@@ -15,9 +15,9 @@ +@@ -18,9 +18,9 @@ */ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog; @@ -954,10 +994,10 @@ index 609b486015..a76022a325 100644 import io.fabric8.knative.client.KnativeClient; import io.fabric8.kubernetes.client.KubernetesClient; diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java -index ae4e02433a..067e27b670 100644 +index dd818d9c9b..0220c39da1 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java -@@ -18,8 +18,8 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog; +@@ -21,8 +21,8 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog; import java.net.URI; import java.util.Optional; @@ -969,10 +1009,10 @@ index ae4e02433a..067e27b670 100644 import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java -index 407230e76d..c119b1b4ef 100644 +index 2900f610eb..9e53d7c6f9 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java -@@ -19,8 +19,8 @@ import java.net.URI; +@@ -22,8 +22,8 @@ import java.net.URI; import java.util.Optional; import java.util.function.Supplier; @@ -984,10 +1024,10 @@ index 407230e76d..c119b1b4ef 100644 import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java -index f2193da323..672ee93723 100644 +index 4299a6bd55..7f7ae2f66f 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java -@@ -20,8 +20,8 @@ import java.net.URI; +@@ -23,8 +23,8 @@ import java.net.URI; import java.util.Optional; import java.util.function.Supplier; @@ -999,10 +1039,10 @@ index f2193da323..672ee93723 100644 import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java -index 0f633000df..fbce47a8d7 100644 +index b895f67362..b5cde6b776 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java -@@ -18,7 +18,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog; +@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog; import java.net.URI; import java.util.Optional; @@ -1012,10 +1052,10 @@ index 0f633000df..fbce47a8d7 100644 import org.junit.jupiter.api.Test; diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java -index 9e3d66eb77..2c1751bc6e 100644 +index e9ed6cb6db..844cb509b8 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java -@@ -15,7 +15,7 @@ +@@ -18,7 +18,7 @@ */ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog; @@ -1025,10 +1065,10 @@ index 9e3d66eb77..2c1751bc6e 100644 import org.junit.jupiter.api.BeforeEach; import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalogTest; diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java -index dfd5f8c3c3..1005e06c49 100644 +index 8a2ed6392d..338a337b5b 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java -@@ -18,7 +18,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog; +@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog; import java.net.URI; import java.util.Optional; @@ -1038,10 +1078,10 @@ index dfd5f8c3c3..1005e06c49 100644 import org.junit.jupiter.api.Test; diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java -index e42ec2cf50..b6a8597679 100644 +index 0c6eb35452..45b8fd3fa9 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java -@@ -18,7 +18,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog; +@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog; import java.net.URI; import java.util.Optional; @@ -1051,10 +1091,10 @@ index e42ec2cf50..b6a8597679 100644 import org.junit.jupiter.api.Test; import org.kie.kogito.addons.quarkus.k8s.test.utils.KnativeResourceDiscoveryTestUtil; diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java -index 8168d4786f..39f8409005 100644 +index b88566787f..f5c23f0a5e 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java -@@ -18,7 +18,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog; +@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog; import java.net.URI; import java.util.Optional; @@ -1064,10 +1104,10 @@ index 8168d4786f..39f8409005 100644 import org.junit.jupiter.api.Test; diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java -index 76069c7866..ff6157d7c9 100644 +index 960436dc1f..d25271fdb3 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java -@@ -18,7 +18,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog; +@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog; import java.net.URI; import java.util.Optional; @@ -1077,10 +1117,10 @@ index 76069c7866..ff6157d7c9 100644 import org.junit.jupiter.api.Test; diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java -index 2a2dfea3f6..228df7dbcc 100644 +index 2a70e3dfd0..7337ccc492 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java -@@ -19,7 +19,7 @@ import java.net.URI; +@@ -22,7 +22,7 @@ import java.net.URI; import java.util.Map; import java.util.Optional; @@ -1090,10 +1130,10 @@ index 2a2dfea3f6..228df7dbcc 100644 import org.junit.jupiter.api.Test; diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java -index d5584edc3d..8edc43c794 100644 +index 525d840a44..68e1a86c4b 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java -@@ -18,7 +18,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog; +@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog; import java.net.URI; import java.util.Optional; @@ -1103,11 +1143,11 @@ index d5584edc3d..8edc43c794 100644 import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java b/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java -index cdd80a9626..dbb1159652 100644 +index 2d07f598e0..22fa2c4b4c 100644 --- a/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java +++ b/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java -@@ -16,17 +16,17 @@ - +@@ -18,17 +18,17 @@ + */ package org.kie.kogito.jobs.quarkus.common; -import javax.enterprise.inject.Instance; @@ -1136,10 +1176,10 @@ index cdd80a9626..dbb1159652 100644 import org.kie.kogito.Application; import org.kie.kogito.jobs.api.JobCallbackPayload; diff --git a/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java b/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java -index 5fcd29c913..cc568d7493 100644 +index 0ba367524d..e65c671c84 100644 --- a/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java +++ b/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java -@@ -18,8 +18,8 @@ package org.kie.kogito.jobs.quarkus.common; +@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.quarkus.common; import java.util.Optional; @@ -1150,7 +1190,7 @@ index 5fcd29c913..cc568d7493 100644 import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -@@ -36,9 +36,9 @@ import org.mockito.junit.jupiter.MockitoExtension; +@@ -38,9 +38,9 @@ import org.mockito.junit.jupiter.MockitoExtension; import com.fasterxml.jackson.databind.ObjectMapper; @@ -1164,10 +1204,10 @@ index 5fcd29c913..cc568d7493 100644 import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; diff --git a/quarkus/addons/jobs/knative-eventing/runtime/pom.xml b/quarkus/addons/jobs/knative-eventing/runtime/pom.xml -index ad641090c9..2972fb53c9 100644 +index ef684cd973..d566bd35fa 100644 --- a/quarkus/addons/jobs/knative-eventing/runtime/pom.xml +++ b/quarkus/addons/jobs/knative-eventing/runtime/pom.xml -@@ -82,7 +82,7 @@ +@@ -102,7 +102,7 @@ io.quarkus @@ -1177,10 +1217,10 @@ index ad641090c9..2972fb53c9 100644 diff --git a/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java b/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java -index d3a558198f..6a7ea79bdf 100644 +index d11d0b35c7..07796c390f 100644 --- a/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java +++ b/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java -@@ -18,8 +18,8 @@ package org.kie.kogito.jobs.knative.eventing.quarkus; +@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.knative.eventing.quarkus; import java.net.URI; @@ -1192,10 +1232,10 @@ index d3a558198f..6a7ea79bdf 100644 import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.reactive.messaging.Channel; diff --git a/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java b/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java -index c4da02e7fa..a1d9e27e8a 100644 +index 74bd0c9b92..c37446e07e 100644 --- a/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java +++ b/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java -@@ -20,7 +20,7 @@ import java.net.URI; +@@ -22,7 +22,7 @@ import java.net.URI; import java.util.List; import java.util.Optional; @@ -1205,10 +1245,10 @@ index c4da02e7fa..a1d9e27e8a 100644 import org.eclipse.microprofile.reactive.messaging.Emitter; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/quarkus/addons/jobs/management/runtime/pom.xml b/quarkus/addons/jobs/management/runtime/pom.xml -index a0f478bb08..59d24ff4db 100644 +index 6f3f9015b5..9155985449 100644 --- a/quarkus/addons/jobs/management/runtime/pom.xml +++ b/quarkus/addons/jobs/management/runtime/pom.xml -@@ -90,7 +90,7 @@ +@@ -110,7 +110,7 @@ io.quarkus @@ -1218,11 +1258,11 @@ index a0f478bb08..59d24ff4db 100644 diff --git a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java -index 9586b68e7c..ebfd4516dd 100644 +index 6b14088785..7216595018 100644 --- a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java +++ b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java -@@ -16,7 +16,7 @@ - +@@ -18,7 +18,7 @@ + */ package org.kie.kogito.jobs.management.quarkus; -import javax.enterprise.context.ApplicationScoped; @@ -1231,10 +1271,10 @@ index 9586b68e7c..ebfd4516dd 100644 import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java -index 61aed9a036..0e7184b72f 100644 +index fe8625f833..1dd1ffb971 100644 --- a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java +++ b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java -@@ -17,11 +17,11 @@ package org.kie.kogito.jobs.management.quarkus; +@@ -20,11 +20,11 @@ package org.kie.kogito.jobs.management.quarkus; import java.net.URI; @@ -1251,10 +1291,10 @@ index 61aed9a036..0e7184b72f 100644 import org.kie.kogito.jobs.ProcessInstanceJobDescription; import org.kie.kogito.jobs.ProcessJobDescription; diff --git a/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java b/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java -index 9801125c62..c6e24c6e37 100644 +index 09e8ba5335..8dd932b3b3 100644 --- a/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java +++ b/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java -@@ -15,7 +15,7 @@ +@@ -18,7 +18,7 @@ */ package org.kie.kogito.jobs.management.quarkus; @@ -1264,10 +1304,10 @@ index 9801125c62..c6e24c6e37 100644 import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/quarkus/addons/jobs/messaging/runtime/pom.xml b/quarkus/addons/jobs/messaging/runtime/pom.xml -index 0e91be1cfc..56c0cea7ed 100644 +index b6ac66d31f..b957a95bc3 100644 --- a/quarkus/addons/jobs/messaging/runtime/pom.xml +++ b/quarkus/addons/jobs/messaging/runtime/pom.xml -@@ -87,7 +87,7 @@ +@@ -107,7 +107,7 @@ io.quarkus @@ -1277,10 +1317,10 @@ index 0e91be1cfc..56c0cea7ed 100644 diff --git a/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java b/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java -index 9894ced190..7052f46fe3 100644 +index 0a0c817288..75a64911a2 100644 --- a/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java +++ b/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java -@@ -18,8 +18,8 @@ package org.kie.kogito.jobs.messaging.quarkus; +@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.messaging.quarkus; import java.net.URI; @@ -1292,10 +1332,10 @@ index 9894ced190..7052f46fe3 100644 import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.reactive.messaging.Channel; diff --git a/quarkus/addons/knative/eventing/runtime/pom.xml b/quarkus/addons/knative/eventing/runtime/pom.xml -index 8b6c805b2c..e500ed07c1 100644 +index 0cd47c2bb5..35d4471ec1 100644 --- a/quarkus/addons/knative/eventing/runtime/pom.xml +++ b/quarkus/addons/knative/eventing/runtime/pom.xml -@@ -54,7 +54,7 @@ +@@ -74,7 +74,7 @@ io.quarkus @@ -1305,10 +1345,10 @@ index 8b6c805b2c..e500ed07c1 100644 diff --git a/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java b/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java -index 4153a39970..dd02bb5268 100644 +index 93acac0969..61ab1bee5a 100644 --- a/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java +++ b/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java -@@ -21,7 +21,7 @@ import java.net.URI; +@@ -23,7 +23,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.UnknownHostException; @@ -1318,10 +1358,10 @@ index 4153a39970..dd02bb5268 100644 import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/quarkus/addons/knative/serving/runtime/pom.xml b/quarkus/addons/knative/serving/runtime/pom.xml -index d5919b1d46..a6c31368b4 100644 +index ada7a01fd7..f2aa7bc834 100644 --- a/quarkus/addons/knative/serving/runtime/pom.xml +++ b/quarkus/addons/knative/serving/runtime/pom.xml -@@ -94,7 +94,7 @@ +@@ -114,7 +114,7 @@ io.quarkus @@ -1331,10 +1371,10 @@ index d5919b1d46..a6c31368b4 100644 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 -index e78681c3b8..74ec97bc65 100644 +index c42d2dccf5..71f9b5abc4 100644 --- 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 -@@ -15,10 +15,10 @@ +@@ -18,10 +18,10 @@ */ package org.kie.kogito.addons.quarkus.knative.serving.customfunctions; @@ -1349,10 +1389,10 @@ index e78681c3b8..74ec97bc65 100644 @ApplicationScoped 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 -index 3e88d6676e..cdd89c7698 100644 +index 4a9a4e9c8e..9a3b12dbf0 100644 --- 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 -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.addons.quarkus.knative.serving.customfunctions; @@ -1364,10 +1404,10 @@ index 3e88d6676e..cdd89c7698 100644 import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog; import org.kogito.workitem.rest.RestWorkItemHandlerUtils; diff --git a/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java b/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java -index 71f9225df1..cb3a8f09ff 100644 +index e2ac72eb39..dfa401d862 100644 --- a/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java +++ b/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.addons.quarkus.knative.serving.customfunctions; @@ -1379,10 +1419,10 @@ index 71f9225df1..cb3a8f09ff 100644 import io.vertx.ext.web.client.WebClientOptions; import io.vertx.mutiny.core.Vertx; 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 -index e1549df41b..77a4491cbd 100644 +index 48771f86d1..84fa677456 100644 --- 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 -@@ -15,7 +15,7 @@ +@@ -18,7 +18,7 @@ */ package org.kie.kogito.addons.quarkus.kubernetes; @@ -1392,10 +1432,10 @@ index e1549df41b..77a4491cbd 100644 import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java b/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java -index abcbda4799..dd6c4a130a 100644 +index b9f49ef000..ddc14ab45d 100644 --- a/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java +++ b/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java -@@ -15,11 +15,11 @@ +@@ -18,11 +18,11 @@ */ package org.kie.kogito.addons.quarkus.kubernetes; @@ -1413,10 +1453,10 @@ index abcbda4799..dd6c4a130a 100644 import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/quarkus/addons/kubernetes/runtime/pom.xml b/quarkus/addons/kubernetes/runtime/pom.xml -index 32ed7e88c9..f9df0a85c5 100644 +index 5a8d6944e1..879c831226 100644 --- a/quarkus/addons/kubernetes/runtime/pom.xml +++ b/quarkus/addons/kubernetes/runtime/pom.xml -@@ -75,7 +75,7 @@ +@@ -95,7 +95,7 @@ io.quarkus @@ -1426,10 +1466,10 @@ index 32ed7e88c9..f9df0a85c5 100644 diff --git a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java -index 6c9aa98079..2ee0bfca5d 100644 +index 8f60636c4a..3260bfb14b 100644 --- a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java +++ b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java -@@ -15,11 +15,11 @@ +@@ -18,11 +18,11 @@ */ package org.kie.kogito.addons.quarkus.k8s; @@ -1447,10 +1487,10 @@ index 6c9aa98079..2ee0bfca5d 100644 import org.kie.kogito.addons.k8s.EndpointDiscovery; import org.kie.kogito.addons.quarkus.k8s.workitems.QuarkusDiscoveredEndpointCaller; diff --git a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java -index 8e3a24887f..4471230cf3 100644 +index 631a72cb34..ec3a3050fd 100644 --- a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java +++ b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java -@@ -15,12 +15,12 @@ +@@ -18,12 +18,12 @@ */ package org.kie.kogito.addons.quarkus.k8s; @@ -1470,10 +1510,10 @@ index 8e3a24887f..4471230cf3 100644 import org.kie.kogito.addons.k8s.KnativeRouteEndpointDiscovery; import org.kie.kogito.addons.k8s.KubernetesServiceEndpointDiscovery; diff --git a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java -index bab6850827..ff8268bd65 100644 +index 3bc6ad7928..e3979a210a 100644 --- a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java +++ b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java -@@ -22,7 +22,7 @@ import java.util.List; +@@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; @@ -1483,10 +1523,10 @@ index bab6850827..ff8268bd65 100644 import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java -index 78e7e9818c..1e9cabca8c 100644 +index 901f7dfe31..9ccb178844 100644 --- a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java +++ b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java -@@ -23,8 +23,8 @@ import java.util.List; +@@ -26,8 +26,8 @@ import java.util.List; import java.util.Map; import java.util.Optional; @@ -1498,10 +1538,10 @@ index 78e7e9818c..1e9cabca8c 100644 import org.junit.jupiter.api.Test; import org.kie.kogito.addons.k8s.Endpoint; diff --git a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java -index 21bfd13d42..ab9286b986 100644 +index 90d5fd773e..291f36b1d9 100644 --- a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java +++ b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java -@@ -17,7 +17,7 @@ package org.kie.kogito.addons.quarkus.k8s.config; +@@ -20,7 +20,7 @@ package org.kie.kogito.addons.quarkus.k8s.config; import java.net.URI; @@ -1511,10 +1551,10 @@ index 21bfd13d42..ab9286b986 100644 import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/quarkus/addons/mail/runtime/pom.xml b/quarkus/addons/mail/runtime/pom.xml -index af87d750fe..d967d932c6 100644 +index 02b09d26b6..b7b57a6eea 100644 --- a/quarkus/addons/mail/runtime/pom.xml +++ b/quarkus/addons/mail/runtime/pom.xml -@@ -41,7 +41,7 @@ +@@ -61,7 +61,7 @@ io.quarkus @@ -1524,10 +1564,10 @@ index af87d750fe..d967d932c6 100644 diff --git a/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java b/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java -index 0aa6799198..e68eb3ee78 100644 +index 90af309c9a..f776accfdd 100644 --- a/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java +++ b/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java -@@ -17,8 +17,8 @@ package org.kie.kogito.mail; +@@ -20,8 +20,8 @@ package org.kie.kogito.mail; import java.util.Arrays; @@ -1537,12 +1577,12 @@ index 0aa6799198..e68eb3ee78 100644 +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; - import org.kie.kogito.event.process.UserTaskDeadlineDataEvent; + import org.kie.kogito.event.usertask.UserTaskInstanceDeadlineDataEvent; diff --git a/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java b/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java -index ebffca8e67..9b3c9334f8 100644 +index 0489f1ed11..8b6d4e02e8 100644 --- a/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java +++ b/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java -@@ -19,7 +19,7 @@ import java.util.HashMap; +@@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; @@ -1552,10 +1592,10 @@ index ebffca8e67..9b3c9334f8 100644 import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/quarkus/addons/marshallers/avro/runtime/pom.xml b/quarkus/addons/marshallers/avro/runtime/pom.xml -index 8e71b03c4e..b9cadff3ae 100644 +index 8ad177a492..fe6df4d7bb 100644 --- a/quarkus/addons/marshallers/avro/runtime/pom.xml +++ b/quarkus/addons/marshallers/avro/runtime/pom.xml -@@ -27,7 +27,7 @@ +@@ -47,7 +47,7 @@ io.quarkus @@ -1565,10 +1605,10 @@ index 8e71b03c4e..b9cadff3ae 100644 diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java -index 06a804316f..f4d14b6cd9 100644 +index 8202f616cc..31890f8776 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java -@@ -20,7 +20,7 @@ import java.io.UncheckedIOException; +@@ -23,7 +23,7 @@ import java.io.UncheckedIOException; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; @@ -1578,10 +1618,10 @@ index 06a804316f..f4d14b6cd9 100644 import org.eclipse.microprofile.reactive.messaging.Message; import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecoratorProvider; diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java -index 9c2a0d8000..2b0f7c6b8d 100644 +index e0673dc70f..a3ee7b4f1e 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java -@@ -19,7 +19,7 @@ import java.util.HashMap; +@@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -1591,10 +1631,10 @@ index 9c2a0d8000..2b0f7c6b8d 100644 import io.vertx.core.impl.ConcurrentHashSet; diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java -index ebe8294f84..e694e58df7 100644 +index de9571dce8..a8ff460ec6 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.addon.quarkus.messaging.common; @@ -1606,10 +1646,10 @@ index ebe8294f84..e694e58df7 100644 import org.eclipse.microprofile.reactive.messaging.Message; import org.slf4j.Logger; diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/ChannelFormat.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/ChannelFormat.java -index 9a553b6a72..16377d7b76 100644 +index 2b4930eab7..52912375ef 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/ChannelFormat.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/ChannelFormat.java -@@ -20,7 +20,7 @@ import java.lang.annotation.Retention; +@@ -23,7 +23,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @@ -1619,10 +1659,10 @@ index 9a553b6a72..16377d7b76 100644 @Qualifier @Retention(RetentionPolicy.RUNTIME) diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java -index ffbeef4978..e45574eecd 100644 +index 6f57ee50c8..e7a795bf2a 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java -@@ -15,9 +15,9 @@ +@@ -18,9 +18,9 @@ */ package org.kie.kogito.addon.quarkus.messaging.common; @@ -1636,10 +1676,10 @@ index ffbeef4978..e45574eecd 100644 import org.kie.kogito.event.CloudEventMarshaller; import org.kie.kogito.event.EventMarshaller; diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java -index cb832147bd..babdfd56da 100644 +index b5c2849f46..5dfaa6901c 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java -@@ -15,9 +15,9 @@ +@@ -18,9 +18,9 @@ */ package org.kie.kogito.addon.quarkus.messaging.common; @@ -1653,10 +1693,10 @@ index cb832147bd..babdfd56da 100644 import org.kie.kogito.event.CloudEventUnmarshallerFactory; import org.kie.kogito.event.EventUnmarshaller; diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java -index 9da769d9bf..eed1f92619 100644 +index d523329561..9e19b484f2 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java -@@ -17,8 +17,8 @@ package org.kie.kogito.addon.quarkus.messaging.common; +@@ -20,8 +20,8 @@ package org.kie.kogito.addon.quarkus.messaging.common; import java.util.concurrent.ExecutorService; @@ -1668,10 +1708,10 @@ index 9da769d9bf..eed1f92619 100644 import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.event.EventExecutorServiceFactory; diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java -index 016603c22b..1347678dea 100644 +index 2d5691cea4..48d018ba79 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java -@@ -15,9 +15,9 @@ +@@ -18,9 +18,9 @@ */ package org.kie.kogito.addon.quarkus.messaging.common; @@ -1684,10 +1724,10 @@ index 016603c22b..1347678dea 100644 import org.kie.kogito.event.cloudevents.extension.KogitoPredictionsExtension; import org.kie.kogito.event.cloudevents.extension.KogitoProcessExtension; diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java -index bdea116ebf..c3b4af4c7d 100644 +index ed9e3b9d78..b0867bc46a 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java -@@ -18,7 +18,7 @@ package org.kie.kogito.addon.quarkus.messaging.common; +@@ -21,7 +21,7 @@ package org.kie.kogito.addon.quarkus.messaging.common; import java.util.Set; import java.util.concurrent.ExecutorService; @@ -1696,7 +1736,7 @@ index bdea116ebf..c3b4af4c7d 100644 import org.kie.kogito.Application; import org.kie.kogito.Model; -@@ -46,7 +46,7 @@ public abstract class QuarkusMessageConsumer extends Abstrac +@@ -49,7 +49,7 @@ public abstract class QuarkusMessageConsumer extends Abstrac init(application, process, trigger, eventReceiver, objectClass, processService, executor, correlation); } @@ -1706,10 +1746,10 @@ index bdea116ebf..c3b4af4c7d 100644 executor.shutdownNow(); } diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java -index a955059306..79f26807c6 100644 +index 7bf474983f..17076ecabd 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java -@@ -19,9 +19,9 @@ import java.util.ArrayList; +@@ -22,9 +22,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -1722,11 +1762,11 @@ index a955059306..79f26807c6 100644 import org.kie.kogito.addon.cloudevents.AbstractTopicDiscovery; import org.kie.kogito.event.ChannelType; diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java -index eb4b1234d8..f71582eba9 100644 +index 04e400127a..98249088ef 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java -@@ -16,15 +16,15 @@ - +@@ -18,15 +18,15 @@ + */ package org.kie.kogito.addon.quarkus.messaging.common; -import javax.annotation.PostConstruct; @@ -1737,7 +1777,6 @@ index eb4b1234d8..f71582eba9 100644 -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -- +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @@ -1745,12 +1784,12 @@ index eb4b1234d8..f71582eba9 100644 +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; -+ + +import jakarta.annotation.PostConstruct; import org.kie.kogito.addon.cloudevents.AbstractTopicsInformationResource; import org.kie.kogito.event.TopicDiscovery; import org.kie.kogito.event.cloudevents.CloudEventMeta; -@@ -46,7 +46,7 @@ public class QuarkusTopicsInformationResource extends AbstractTopicsInformationR +@@ -48,7 +48,7 @@ public class QuarkusTopicsInformationResource extends AbstractTopicsInformationR @GET() @Produces(MediaType.APPLICATION_JSON) @@ -1760,39 +1799,11 @@ index eb4b1234d8..f71582eba9 100644 + return jakarta.ws.rs.core.Response.ok(getTopicList()).build(); } } -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 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 @@ - */ - package org.kie.kogito.addon.quarkus.messaging.common.message; - --import javax.ws.rs.core.HttpHeaders; -+import jakarta.ws.rs.core.HttpHeaders; - - import org.eclipse.microprofile.reactive.messaging.Message; - import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecorator; -diff --git a/quarkus/addons/messaging/common/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/CloudEventHttpOutgoingDecoratorTest.java b/quarkus/addons/messaging/common/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/CloudEventHttpOutgoingDecoratorTest.java -index 871d017e77..8715facb83 100644 ---- a/quarkus/addons/messaging/common/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/CloudEventHttpOutgoingDecoratorTest.java -+++ b/quarkus/addons/messaging/common/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/CloudEventHttpOutgoingDecoratorTest.java -@@ -18,8 +18,8 @@ package org.kie.kogito.addon.quarkus.messaging.common.message; - import java.util.Collections; - import java.util.Optional; - --import javax.enterprise.inject.Produces; --import javax.inject.Inject; -+import jakarta.enterprise.inject.Produces; -+import jakarta.inject.Inject; - - import org.eclipse.microprofile.reactive.messaging.Message; - import org.junit.jupiter.api.Test; diff --git a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/ChannelQualifierQuarkusTemplate.java b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/ChannelQualifierQuarkusTemplate.java -index 41974d80c5..c0758ca7d7 100644 +index 9231080865..5e181d11e1 100644 --- a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/ChannelQualifierQuarkusTemplate.java +++ b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/ChannelQualifierQuarkusTemplate.java -@@ -20,7 +20,7 @@ import java.lang.annotation.Retention; +@@ -23,7 +23,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @@ -1802,10 +1813,10 @@ index 41974d80c5..c0758ca7d7 100644 @Qualifier @Retention(RetentionPolicy.RUNTIME) diff --git a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventEmitterQuarkusTemplate.java b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventEmitterQuarkusTemplate.java -index 803f621abf..c7d7e37afa 100644 +index c327facbc7..f3bed99ca8 100644 --- a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventEmitterQuarkusTemplate.java +++ b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventEmitterQuarkusTemplate.java -@@ -16,9 +16,8 @@ +@@ -19,9 +19,8 @@ package $Package$; @@ -1818,10 +1829,10 @@ index 803f621abf..c7d7e37afa 100644 import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; diff --git a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventReceiverQuarkusTemplate.java b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventReceiverQuarkusTemplate.java -index 8a23525327..acbd1c48ca 100644 +index d08fb836f3..ab37c6836a 100644 --- a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventReceiverQuarkusTemplate.java +++ b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventReceiverQuarkusTemplate.java -@@ -18,12 +18,11 @@ package $Package$; +@@ -21,12 +21,11 @@ package $Package$; import java.util.concurrent.CompletionStage; @@ -1837,10 +1848,10 @@ index 8a23525327..acbd1c48ca 100644 import io.quarkus.runtime.Startup; diff --git a/quarkus/addons/messaging/runtime/pom.xml b/quarkus/addons/messaging/runtime/pom.xml -index d5a81c2cef..b80ef76384 100644 +index 5e5774200d..c5fb3af1f8 100644 --- a/quarkus/addons/messaging/runtime/pom.xml +++ b/quarkus/addons/messaging/runtime/pom.xml -@@ -52,7 +52,7 @@ +@@ -72,7 +72,7 @@ io.quarkus @@ -1850,11 +1861,11 @@ index d5a81c2cef..b80ef76384 100644 diff --git a/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java b/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java -index d6618e0ffd..1e820b4df2 100644 +index fb1acfc266..16474d1f42 100644 --- a/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java +++ b/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java -@@ -16,9 +16,9 @@ - +@@ -18,9 +18,9 @@ + */ package org.kie.kogito.addon.messaging; -import javax.annotation.PostConstruct; @@ -1867,10 +1878,10 @@ 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 +index d0fbd43584..6f268d4ba5 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 @@ +@@ -67,7 +67,7 @@ io.quarkus @@ -1880,25 +1891,23 @@ index 0de7a857aa..96777ed600 100644 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 +index 362a3fcd16..ff698f32f0 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; +@@ -21,7 +21,7 @@ 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.eclipse.microprofile.config.ConfigProvider; 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 +index cd8ec75380..08c6e2e0d5 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 @@ +@@ -18,7 +18,7 @@ */ package org.kie.kogito.addons.quarkus.microprofile.config.service.catalog; @@ -1908,10 +1917,10 @@ index 28f7abe736..7ac841fb71 100644 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 +index 84c7a85d72..9654aec7f3 100644 --- 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 -@@ -15,9 +15,9 @@ +@@ -18,9 +18,9 @@ */ package org.kie.kogito.monitoring.core.quarkus; @@ -1925,10 +1934,10 @@ index c0dc15fd1d..478cd757c5 100644 import org.kie.kogito.KogitoGAV; import org.kie.kogito.config.ConfigBean; diff --git a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java -index bce1da1776..130135619b 100644 +index ca00b36ca0..f51cfb49b3 100644 --- a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java +++ b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java -@@ -15,12 +15,12 @@ +@@ -18,12 +18,12 @@ */ package org.kie.kogito.monitoring.core.quarkus; @@ -1948,10 +1957,10 @@ index bce1da1776..130135619b 100644 import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.KogitoGAV; diff --git a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java -index c486ca5ab3..bfbc64e244 100644 +index 66bfaab7e6..1501904a6e 100644 --- a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java +++ b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java -@@ -17,9 +17,9 @@ package org.kie.kogito.monitoring.core.quarkus; +@@ -20,9 +20,9 @@ package org.kie.kogito.monitoring.core.quarkus; import java.util.List; @@ -1965,10 +1974,10 @@ index c486ca5ab3..bfbc64e244 100644 import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor; diff --git a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java -index 671e17e2d0..50330c7cff 100644 +index 9b4e4c7ab7..c87d17e8fd 100644 --- a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java +++ b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java -@@ -15,10 +15,10 @@ +@@ -18,10 +18,10 @@ */ package org.kie.kogito.monitoring.core.quarkus; @@ -1983,10 +1992,10 @@ index 671e17e2d0..50330c7cff 100644 import org.kie.kogito.config.ConfigBean; import org.kie.kogito.monitoring.core.common.system.metrics.SystemMetricsCollector; diff --git a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java -index ba32350482..934dacf778 100644 +index 56c7d8c796..cc74d0bb0d 100644 --- a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java +++ b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java -@@ -17,8 +17,8 @@ package org.kie.kogito.monitoring.core.quarkus; +@@ -20,8 +20,8 @@ package org.kie.kogito.monitoring.core.quarkus; import java.util.List; @@ -1998,10 +2007,10 @@ index ba32350482..934dacf778 100644 import org.junit.jupiter.api.Test; import org.kie.kogito.monitoring.core.common.mock.MockedConfigBean; diff --git a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java -index ecd08becd3..14989d4d53 100644 +index 4e8be58a22..87b6340558 100644 --- a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java +++ b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java -@@ -19,10 +19,10 @@ import java.util.Arrays; +@@ -22,10 +22,10 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -2017,10 +2026,10 @@ index ecd08becd3..14989d4d53 100644 import org.junit.jupiter.api.Test; import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor; diff --git a/quarkus/addons/monitoring/elastic/runtime/pom.xml b/quarkus/addons/monitoring/elastic/runtime/pom.xml -index 4487866fb2..393d1f3e8a 100644 +index 191e6eb530..45bafdfa20 100644 --- a/quarkus/addons/monitoring/elastic/runtime/pom.xml +++ b/quarkus/addons/monitoring/elastic/runtime/pom.xml -@@ -32,7 +32,7 @@ +@@ -52,7 +52,7 @@ io.quarkus @@ -2030,10 +2039,10 @@ index 4487866fb2..393d1f3e8a 100644 diff --git a/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java b/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java -index 08dd6c8568..2097ed9d8a 100644 +index 9d2dca4a9d..af3679c91e 100644 --- a/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java +++ b/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java -@@ -17,8 +17,8 @@ package org.kie.kogito.monitoring.elastic.quarkus; +@@ -20,8 +20,8 @@ package org.kie.kogito.monitoring.elastic.quarkus; import java.util.Optional; @@ -2045,10 +2054,10 @@ index 08dd6c8568..2097ed9d8a 100644 import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.monitoring.elastic.common.ElasticConfigFactory; diff --git a/quarkus/addons/monitoring/prometheus/runtime/pom.xml b/quarkus/addons/monitoring/prometheus/runtime/pom.xml -index c3ac08f49e..6b53bd08a0 100644 +index dce794681b..bba6028337 100644 --- a/quarkus/addons/monitoring/prometheus/runtime/pom.xml +++ b/quarkus/addons/monitoring/prometheus/runtime/pom.xml -@@ -53,7 +53,7 @@ +@@ -73,7 +73,7 @@ io.quarkus @@ -2058,10 +2067,10 @@ index c3ac08f49e..6b53bd08a0 100644 diff --git a/quarkus/addons/persistence/filesystem/runtime/pom.xml b/quarkus/addons/persistence/filesystem/runtime/pom.xml -index b1f0446419..5e93af241f 100644 +index ae1beb5271..4ad157edc4 100644 --- a/quarkus/addons/persistence/filesystem/runtime/pom.xml +++ b/quarkus/addons/persistence/filesystem/runtime/pom.xml -@@ -58,7 +58,7 @@ +@@ -62,7 +62,7 @@ io.quarkus @@ -2071,11 +2080,11 @@ index b1f0446419..5e93af241f 100644 diff --git a/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java b/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java -index 0fd6369208..f5bb74e762 100644 +index 254319bd4a..49ebd0dd73 100644 --- a/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java +++ b/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java -@@ -16,8 +16,8 @@ - +@@ -18,8 +18,8 @@ + */ package org.kie.kogito.persistence.quarkus; -import javax.enterprise.context.ApplicationScoped; @@ -2086,10 +2095,10 @@ index 0fd6369208..f5bb74e762 100644 import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.persistence.filesystem.AbstractProcessInstancesFactory; diff --git a/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java b/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java -index 92245898e4..2b7b0e20e2 100644 +index e7a94178fa..1a3eb9199c 100644 --- a/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java +++ b/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java -@@ -21,7 +21,7 @@ import java.util.Optional; +@@ -24,7 +24,7 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -2099,10 +2108,10 @@ index 92245898e4..2b7b0e20e2 100644 import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java b/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java -index 2107932098..ee1c2a50f2 100644 +index d8a82321c5..460341686d 100644 --- a/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java +++ b/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java -@@ -15,10 +15,10 @@ +@@ -18,10 +18,10 @@ */ package org.kie.kogito.infinispan.health; @@ -2117,10 +2126,10 @@ index 2107932098..ee1c2a50f2 100644 import org.infinispan.client.hotrod.RemoteCacheManager; import org.junit.jupiter.api.Test; diff --git a/quarkus/addons/persistence/infinispan/runtime/pom.xml b/quarkus/addons/persistence/infinispan/runtime/pom.xml -index 8482d8911c..739dab2a7b 100644 +index 37dc06d077..505fcc4ed3 100644 --- a/quarkus/addons/persistence/infinispan/runtime/pom.xml +++ b/quarkus/addons/persistence/infinispan/runtime/pom.xml -@@ -58,7 +58,7 @@ +@@ -62,7 +62,7 @@ io.quarkus @@ -2130,10 +2139,10 @@ index 8482d8911c..739dab2a7b 100644 diff --git a/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java b/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java -index 96d2192088..9e34b69376 100644 +index 4442674234..222d287c54 100644 --- a/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java +++ b/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java -@@ -18,8 +18,8 @@ package org.kie.kogito.persistence.quarkus; +@@ -20,8 +20,8 @@ package org.kie.kogito.persistence.quarkus; import java.util.Optional; @@ -2145,10 +2154,10 @@ index 96d2192088..9e34b69376 100644 import org.eclipse.microprofile.config.inject.ConfigProperty; import org.infinispan.client.hotrod.RemoteCacheManager; diff --git a/quarkus/addons/persistence/jdbc/runtime/pom.xml b/quarkus/addons/persistence/jdbc/runtime/pom.xml -index 3b5bf94b2e..eab5ac273e 100644 +index 662f3f4226..c5769eb598 100644 --- a/quarkus/addons/persistence/jdbc/runtime/pom.xml +++ b/quarkus/addons/persistence/jdbc/runtime/pom.xml -@@ -72,7 +72,7 @@ +@@ -76,7 +76,7 @@ io.quarkus @@ -2158,11 +2167,11 @@ index 3b5bf94b2e..eab5ac273e 100644 diff --git a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java -index b82187c949..587bd72e12 100644 +index 6cf9776ceb..384eb6ac09 100644 --- a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java +++ b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java -@@ -16,8 +16,8 @@ - +@@ -18,8 +18,8 @@ + */ package org.kie.kogito.persistence.quarkus; -import javax.enterprise.context.ApplicationScoped; @@ -2173,10 +2182,10 @@ index b82187c949..587bd72e12 100644 import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java -index 45d6fe1144..33a13bba2c 100644 +index a4aefa406b..b73095c95d 100644 --- a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java +++ b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java -@@ -18,7 +18,7 @@ package org.kie.kogito.persistence.quarkus; +@@ -21,7 +21,7 @@ package org.kie.kogito.persistence.quarkus; import java.sql.Connection; import java.sql.SQLException; @@ -2186,10 +2195,10 @@ index 45d6fe1144..33a13bba2c 100644 import org.kie.kogito.correlation.CorrelationService; diff --git a/quarkus/addons/persistence/kafka/runtime/pom.xml b/quarkus/addons/persistence/kafka/runtime/pom.xml -index 4180a4c9b7..6c7c92cd5e 100644 +index 796a2bf0e4..57e3a66e61 100644 --- a/quarkus/addons/persistence/kafka/runtime/pom.xml +++ b/quarkus/addons/persistence/kafka/runtime/pom.xml -@@ -117,7 +117,7 @@ +@@ -121,7 +121,7 @@ io.quarkus @@ -2199,10 +2208,10 @@ index 4180a4c9b7..6c7c92cd5e 100644 diff --git a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java -index 33f09b3f14..70eaa92bb3 100644 +index b5be2b3d0e..d5bf80a692 100644 --- a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java +++ b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java -@@ -17,10 +17,10 @@ package org.kie.kogito.persistence; +@@ -20,10 +20,10 @@ package org.kie.kogito.persistence; import java.util.Map; @@ -2217,10 +2226,10 @@ index 33f09b3f14..70eaa92bb3 100644 import org.apache.kafka.common.serialization.ByteArraySerializer; import org.apache.kafka.common.serialization.StringSerializer; diff --git a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java -index bd5bfcc585..b9490caf04 100644 +index 1001f512a9..052f652d7b 100644 --- a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java +++ b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java -@@ -20,10 +20,10 @@ import java.util.Collection; +@@ -22,10 +22,10 @@ import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -2235,10 +2244,10 @@ index bd5bfcc585..b9490caf04 100644 import org.apache.kafka.streams.StoreQueryParameters; import org.apache.kafka.streams.state.QueryableStoreTypes; diff --git a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java -index 641b7e691a..c3ec471b68 100644 +index 11b87ac30e..a4710f9471 100644 --- a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java +++ b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.persistence.kafka; @@ -2250,10 +2259,10 @@ index 641b7e691a..c3ec471b68 100644 import org.apache.kafka.streams.Topology; diff --git a/quarkus/addons/persistence/mongodb/runtime/pom.xml b/quarkus/addons/persistence/mongodb/runtime/pom.xml -index dff5d8ac92..3f58530ef0 100644 +index df3c14557e..e6f069ff88 100644 --- a/quarkus/addons/persistence/mongodb/runtime/pom.xml +++ b/quarkus/addons/persistence/mongodb/runtime/pom.xml -@@ -46,7 +46,7 @@ +@@ -66,7 +66,7 @@ io.quarkus @@ -2263,11 +2272,11 @@ index dff5d8ac92..3f58530ef0 100644 diff --git a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java -index 50cd0c864c..82968f4326 100644 +index 5a4ab35c7d..43b005f712 100644 --- a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java +++ b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java -@@ -16,8 +16,8 @@ - +@@ -18,8 +18,8 @@ + */ package org.kie.kogito.persistence.quarkus; -import javax.enterprise.context.ApplicationScoped; @@ -2278,11 +2287,11 @@ index 50cd0c864c..82968f4326 100644 import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.mongodb.AbstractProcessInstancesFactory; diff --git a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java -index b216cb27bf..f921041a20 100644 +index d237aaf1da..0979fa9f36 100644 --- a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java +++ b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java -@@ -16,8 +16,8 @@ - +@@ -18,8 +18,8 @@ + */ package org.kie.kogito.persistence.quarkus; -import javax.enterprise.context.ApplicationScoped; @@ -2293,10 +2302,10 @@ index b216cb27bf..f921041a20 100644 import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.mongodb.transaction.AbstractTransactionManager; diff --git a/quarkus/addons/persistence/postgresql/runtime/pom.xml b/quarkus/addons/persistence/postgresql/runtime/pom.xml -index 313e265e12..0eec3b0607 100644 +index 692796ad39..d4e79ec6cc 100644 --- a/quarkus/addons/persistence/postgresql/runtime/pom.xml +++ b/quarkus/addons/persistence/postgresql/runtime/pom.xml -@@ -71,7 +71,7 @@ +@@ -75,7 +75,7 @@ io.quarkus @@ -2306,11 +2315,11 @@ index 313e265e12..0eec3b0607 100644 diff --git a/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java b/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java -index 613dc845ed..60d4d45251 100644 +index 042466ddf8..b0688f0402 100644 --- a/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java +++ b/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java -@@ -16,8 +16,8 @@ - +@@ -18,8 +18,8 @@ + */ package org.kie.kogito.persistence.quarkus; -import javax.enterprise.context.ApplicationScoped; @@ -2321,10 +2330,10 @@ index 613dc845ed..60d4d45251 100644 import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.persistence.postgresql.AbstractProcessInstancesFactory; diff --git a/quarkus/addons/persistence/rocksdb/runtime/pom.xml b/quarkus/addons/persistence/rocksdb/runtime/pom.xml -index 63f8fecb62..977fccae63 100644 +index 8b9c28b96c..9c2c05ee4a 100644 --- a/quarkus/addons/persistence/rocksdb/runtime/pom.xml +++ b/quarkus/addons/persistence/rocksdb/runtime/pom.xml -@@ -41,7 +41,7 @@ +@@ -61,7 +61,7 @@ io.quarkus @@ -2334,10 +2343,10 @@ index 63f8fecb62..977fccae63 100644 diff --git a/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java b/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java -index 83e7d81c55..8daa52c6e1 100644 +index 4cd5e21188..0b9c49ae20 100644 --- a/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java +++ b/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java -@@ -15,12 +15,12 @@ +@@ -18,12 +18,12 @@ */ package org.kie.kogito.persistence.quarkus.rocksdb; @@ -2356,10 +2365,10 @@ index 83e7d81c55..8daa52c6e1 100644 import org.kie.kogito.process.ProcessInstancesFactory; import org.rocksdb.Options; diff --git a/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java b/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java -index 2b7c9d0879..7a9b4af18f 100644 +index b2cc040a5c..84dd1d05b3 100644 --- a/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java +++ b/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java -@@ -15,20 +15,20 @@ +@@ -18,20 +18,20 @@ */ package org.kie.kogito.process.definitions; @@ -2392,10 +2401,10 @@ index 2b7c9d0879..7a9b4af18f 100644 import org.kie.kogito.process.ProcessInstancesFactory; import org.kie.kogito.serverless.workflow.executor.StaticWorkflowApplication; diff --git a/quarkus/addons/process-management/runtime/pom.xml b/quarkus/addons/process-management/runtime/pom.xml -index ce0eedf6cd..eea0ab21f5 100644 +index 56b200c8af..dc151b4067 100644 --- a/quarkus/addons/process-management/runtime/pom.xml +++ b/quarkus/addons/process-management/runtime/pom.xml -@@ -60,9 +60,10 @@ +@@ -80,9 +80,10 @@ test @@ -2404,11 +2413,11 @@ index ce0eedf6cd..eea0ab21f5 100644 + jakarta.xml.bind + jakarta.xml.bind-api test -+ 4.0.0 ++ 4.0.1 -@@ -70,7 +71,7 @@ +@@ -90,7 +91,7 @@ io.quarkus @@ -2418,10 +2427,10 @@ index ce0eedf6cd..eea0ab21f5 100644 diff --git a/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java b/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java -index aa8ebbbca3..6651462922 100644 +index a8c0ffd9af..fd71154a44 100644 --- a/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java +++ b/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java -@@ -15,17 +15,17 @@ +@@ -18,17 +18,17 @@ */ package org.kie.kogito.process.management; @@ -2451,10 +2460,10 @@ index aa8ebbbca3..6651462922 100644 import org.kie.kogito.Application; import org.kie.kogito.process.Processes; diff --git a/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java b/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java -index eb834c6b3b..5b3f3ce75e 100644 +index 7db5f82d61..9a1f266bcb 100644 --- a/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java +++ b/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java -@@ -17,12 +17,12 @@ package org.kie.kogito.process.management; +@@ -20,12 +20,12 @@ package org.kie.kogito.process.management; import java.util.Optional; @@ -2474,10 +2483,10 @@ index eb834c6b3b..5b3f3ce75e 100644 import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; diff --git a/quarkus/addons/process-svg/runtime/pom.xml b/quarkus/addons/process-svg/runtime/pom.xml -index eccd95d1fe..975fd59a88 100644 +index 5a8dec89b9..b4453e7870 100644 --- a/quarkus/addons/process-svg/runtime/pom.xml +++ b/quarkus/addons/process-svg/runtime/pom.xml -@@ -18,8 +18,8 @@ +@@ -38,8 +38,8 @@ kogito-addons-process-svg @@ -2488,7 +2497,7 @@ index eccd95d1fe..975fd59a88 100644 -@@ -73,7 +73,7 @@ +@@ -93,7 +93,7 @@ io.quarkus @@ -2498,10 +2507,10 @@ index eccd95d1fe..975fd59a88 100644 diff --git a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java -index e229f617e9..2e1be96d17 100644 +index e5763343ce..1d476c8628 100644 --- a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java +++ b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java -@@ -21,10 +21,10 @@ import java.net.URL; +@@ -23,10 +23,10 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; @@ -2516,10 +2525,10 @@ index e229f617e9..2e1be96d17 100644 import org.kie.kogito.svg.ProcessSVGException; import org.slf4j.Logger; diff --git a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java -index 7783ae1d08..7159a14f65 100644 +index 31e75cd256..c18ee17d72 100644 --- a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java +++ b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java -@@ -17,15 +17,15 @@ package org.kie.kogito.svg.rest; +@@ -20,15 +20,15 @@ package org.kie.kogito.svg.rest; import java.util.Optional; @@ -2545,10 +2554,10 @@ index 7783ae1d08..7159a14f65 100644 import org.kie.kogito.svg.ProcessSvgService; diff --git a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java -index 295de81ef7..e85b0f8c09 100644 +index a648a30cd3..05618b33e1 100644 --- a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java +++ b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java -@@ -17,8 +17,8 @@ package org.kie.kogito.svg.service; +@@ -20,8 +20,8 @@ package org.kie.kogito.svg.service; import java.util.Optional; @@ -2560,10 +2569,10 @@ index 295de81ef7..e85b0f8c09 100644 import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.svg.AbstractProcessSvgService; diff --git a/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java b/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java -index 9316ad12b6..fc98d52f66 100644 +index f32843b94b..cfc673a546 100644 --- a/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java +++ b/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java -@@ -15,9 +15,9 @@ +@@ -18,9 +18,9 @@ */ package org.kie.kogito.quarkus.serverless.workflow.python; @@ -2577,10 +2586,10 @@ index 9316ad12b6..fc98d52f66 100644 import org.kie.kogito.internal.process.runtime.KogitoWorkItemHandler; import org.kie.kogito.process.impl.CachedWorkItemHandlerConfig; diff --git a/quarkus/addons/rest-exception-handler/pom.xml b/quarkus/addons/rest-exception-handler/pom.xml -index d0ffa42730..abbc56828f 100644 +index 12b7491c88..bfbffcd8d6 100644 --- a/quarkus/addons/rest-exception-handler/pom.xml +++ b/quarkus/addons/rest-exception-handler/pom.xml -@@ -47,9 +47,10 @@ +@@ -67,9 +67,10 @@ test @@ -2589,16 +2598,16 @@ index d0ffa42730..abbc56828f 100644 + jakarta.xml.bind + jakarta.xml.bind-api test -+ 4.0.0 ++ 4.0.1 \ No newline at end of file diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionMapper.java -index 552b181be1..c0f2343e57 100644 +index febb17b17d..21b70e76d7 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionMapper.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.resource.exceptions; @@ -2610,10 +2619,10 @@ index 552b181be1..c0f2343e57 100644 public abstract class BaseExceptionMapper implements ExceptionMapper { diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ExceptionsHandler.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ExceptionsHandler.java -index febd898043..cf610ebd00 100644 +index cdff6f06a0..ec1bd6679d 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ExceptionsHandler.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ExceptionsHandler.java -@@ -15,9 +15,9 @@ +@@ -18,9 +18,9 @@ */ package org.kie.kogito.resource.exceptions; @@ -2627,10 +2636,10 @@ index febd898043..cf610ebd00 100644 public class ExceptionsHandler extends BaseExceptionsHandler { diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/IllegalArgumentExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/IllegalArgumentExceptionMapper.java -index cfec173331..dd6db2f01a 100644 +index 92199a0057..56a734a511 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/IllegalArgumentExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/IllegalArgumentExceptionMapper.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.resource.exceptions; @@ -2642,10 +2651,10 @@ index cfec173331..dd6db2f01a 100644 @Provider public class IllegalArgumentExceptionMapper extends BaseExceptionMapper { diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java -index 9fea8b1f57..88a31e44c0 100644 +index 8ff7cbe62f..976baa4bfc 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.resource.exceptions; @@ -2657,10 +2666,10 @@ index 9fea8b1f57..88a31e44c0 100644 import org.kie.kogito.process.workitem.InvalidLifeCyclePhaseException; diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java -index 8bdb1363e3..aedc88e1e4 100644 +index 209d2207db..ef21f6b61b 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.resource.exceptions; @@ -2672,10 +2681,10 @@ index 8bdb1363e3..aedc88e1e4 100644 import org.kie.kogito.process.workitem.InvalidTransitionException; diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java -index 09df31e7ef..0086bbaa99 100644 +index be499edcf0..f1f131945e 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.resource.exceptions; @@ -2687,10 +2696,10 @@ index 09df31e7ef..0086bbaa99 100644 import org.kie.kogito.process.NodeInstanceNotFoundException; diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java -index c2be7ac83b..d68ab1112f 100644 +index 539aa490e7..4ac3965b2c 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.resource.exceptions; @@ -2702,10 +2711,10 @@ index c2be7ac83b..d68ab1112f 100644 import org.kie.kogito.process.NodeNotFoundException; diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java -index 428edf84a5..6374caac49 100644 +index d12161df80..29e5056652 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.resource.exceptions; @@ -2717,10 +2726,10 @@ index 428edf84a5..6374caac49 100644 import org.kie.kogito.process.workitem.NotAuthorizedException; diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java -index 88ac4af0bc..5f743d623e 100644 +index 02ab996453..59bec8b102 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.resource.exceptions; @@ -2732,10 +2741,10 @@ index 88ac4af0bc..5f743d623e 100644 import org.kie.kogito.process.ProcessInstanceDuplicatedException; diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java -index 2b4691c932..c972e25972 100644 +index 895f9db741..4d450420eb 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.resource.exceptions; @@ -2747,10 +2756,10 @@ index 2b4691c932..c972e25972 100644 import org.kie.kogito.process.ProcessInstanceExecutionException; diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java -index 5bff8c2d3b..fc7bee1281 100644 +index 7bbbaeee51..27391a3a31 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.resource.exceptions; @@ -2762,10 +2771,10 @@ index 5bff8c2d3b..fc7bee1281 100644 import org.kie.kogito.process.ProcessInstanceNotFoundException; diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java -index f53b96b25a..3fa0018a5e 100644 +index ba6b6318b8..ce80911352 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.resource.exceptions; @@ -2776,11 +2785,26 @@ index f53b96b25a..3fa0018a5e 100644 import org.kie.kogito.process.VariableViolationException; +diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java +index 73bdac8cc7..201c6180cc 100644 +--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java ++++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java +@@ -18,8 +18,8 @@ + */ + package org.kie.kogito.resource.exceptions; + +-import javax.ws.rs.core.Response; +-import javax.ws.rs.ext.Provider; ++import jakarta.ws.rs.core.Response; ++import jakarta.ws.rs.ext.Provider; + + import org.kie.kogito.process.workitem.WorkItemExecutionException; + diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java -index cadfa22489..247b456852 100644 +index 53b26200d0..0b0f3ff03a 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.resource.exceptions; @@ -2792,10 +2816,10 @@ index cadfa22489..247b456852 100644 import org.kie.kogito.internal.process.runtime.WorkItemNotFoundException; diff --git a/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java b/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java -index d23e927288..800ab5c9b6 100644 +index 15369715df..ce16cc01af 100644 --- a/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java +++ b/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java -@@ -15,10 +15,10 @@ +@@ -18,10 +18,10 @@ */ package org.kie.kogito.resource.exceptions; @@ -2811,10 +2835,10 @@ index d23e927288..800ab5c9b6 100644 import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/quarkus/addons/source-files/runtime/pom.xml b/quarkus/addons/source-files/runtime/pom.xml -index 06f3532bfd..871eaaab54 100644 +index be08c219f5..fa74154832 100644 --- a/quarkus/addons/source-files/runtime/pom.xml +++ b/quarkus/addons/source-files/runtime/pom.xml -@@ -103,7 +103,7 @@ +@@ -123,7 +123,7 @@ io.quarkus @@ -2824,10 +2848,10 @@ index 06f3532bfd..871eaaab54 100644 diff --git a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesProviderProducer.java b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesProviderProducer.java -index a75b317d05..45711af7c8 100644 +index ef53747f28..dc4ac4d01d 100644 --- a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesProviderProducer.java +++ b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesProviderProducer.java -@@ -15,9 +15,9 @@ +@@ -18,9 +18,9 @@ */ package org.kie.kogito.addon.source.files; @@ -2841,10 +2865,10 @@ index a75b317d05..45711af7c8 100644 @ApplicationScoped public final class SourceFilesProviderProducer { diff --git a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java -index 7583c4ed3c..aa15b5bdae 100644 +index b8d60de991..8866e3c887 100644 --- a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java +++ b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java -@@ -15,7 +15,7 @@ +@@ -18,7 +18,7 @@ */ package org.kie.kogito.addon.source.files; @@ -2854,10 +2878,10 @@ index 7583c4ed3c..aa15b5bdae 100644 import io.quarkus.runtime.annotations.Recorder; diff --git a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java -index f4fc85e3ae..2f5364fd2d 100644 +index ab48413783..da618e2728 100644 --- a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java +++ b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java -@@ -20,15 +20,15 @@ import java.io.IOException; +@@ -23,15 +23,15 @@ import java.io.IOException; import java.io.InputStream; import java.util.Collection; @@ -2883,10 +2907,10 @@ index f4fc85e3ae..2f5364fd2d 100644 import org.kie.kogito.resource.exceptions.ExceptionsHandler; diff --git a/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java b/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java -index c2ad3e8355..49a0d884af 100644 +index 926b5b0d79..82414cb6ea 100644 --- a/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java +++ b/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java -@@ -17,7 +17,7 @@ package org.kie.kogito.addon.source.files; +@@ -20,7 +20,7 @@ package org.kie.kogito.addon.source.files; import java.util.Optional; @@ -2896,10 +2920,10 @@ index c2ad3e8355..49a0d884af 100644 import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/quarkus/addons/task-management/runtime/pom.xml b/quarkus/addons/task-management/runtime/pom.xml -index 02ffb5bd84..ede13669a9 100644 +index 8b32acf4d6..bf82ce020e 100644 --- a/quarkus/addons/task-management/runtime/pom.xml +++ b/quarkus/addons/task-management/runtime/pom.xml -@@ -61,7 +61,7 @@ +@@ -81,7 +81,7 @@ io.quarkus @@ -2909,10 +2933,10 @@ index 02ffb5bd84..ede13669a9 100644 diff --git a/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java b/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java -index 24a604c875..764baaf1b7 100644 +index d3b7f7fec6..624c19a504 100644 --- a/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java +++ b/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java -@@ -15,20 +15,20 @@ +@@ -18,20 +18,20 @@ */ package org.kie.kogito.task.management; @@ -2946,10 +2970,10 @@ index 24a604c875..764baaf1b7 100644 import org.kie.kogito.process.ProcessConfig; import org.kie.kogito.process.Processes; diff --git a/quarkus/addons/task-notification/runtime/pom.xml b/quarkus/addons/task-notification/runtime/pom.xml -index c4079745a5..587a908f17 100644 +index 742c89aa44..dac5a7dc64 100644 --- a/quarkus/addons/task-notification/runtime/pom.xml +++ b/quarkus/addons/task-notification/runtime/pom.xml -@@ -63,7 +63,7 @@ +@@ -83,7 +83,7 @@ io.quarkus @@ -2959,10 +2983,10 @@ index c4079745a5..587a908f17 100644 diff --git a/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java b/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java -index 4d8d26c4a1..7a10464d29 100644 +index 774aa066f5..287af70636 100644 --- a/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java +++ b/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java -@@ -17,8 +17,8 @@ package org.kie.kogito.task.notification.quarkus; +@@ -20,8 +20,8 @@ package org.kie.kogito.task.notification.quarkus; import java.util.Collection; @@ -2974,10 +2998,10 @@ index 4d8d26c4a1..7a10464d29 100644 import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; diff --git a/quarkus/addons/tracing-decision/runtime/pom.xml b/quarkus/addons/tracing-decision/runtime/pom.xml -index df07561419..e7e7a0404d 100644 +index 98b4ff95bf..1b545bebf6 100644 --- a/quarkus/addons/tracing-decision/runtime/pom.xml +++ b/quarkus/addons/tracing-decision/runtime/pom.xml -@@ -84,7 +84,7 @@ +@@ -104,7 +104,7 @@ io.quarkus @@ -2987,10 +3011,10 @@ index df07561419..e7e7a0404d 100644 diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java -index c21064a2c7..b3d9db47d7 100644 +index 1d64d0f96e..20d98853d7 100644 --- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java +++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java -@@ -17,8 +17,8 @@ package org.kie.kogito.tracing.decision; +@@ -20,8 +20,8 @@ package org.kie.kogito.tracing.decision; import java.util.function.BiFunction; @@ -3002,10 +3026,10 @@ index c21064a2c7..b3d9db47d7 100644 import org.kie.kogito.Application; import org.kie.kogito.config.ConfigBean; diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java -index a9f35085a7..c6fc70e2d0 100644 +index c6a39d43bd..586cd9df64 100644 --- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java +++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.tracing.decision; @@ -3017,10 +3041,10 @@ index a9f35085a7..c6fc70e2d0 100644 import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java -index 89b34e7554..0868563be8 100644 +index fb09ff6065..01c7c4b628 100644 --- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java +++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.tracing.decision; @@ -3032,10 +3056,10 @@ index 89b34e7554..0868563be8 100644 import org.eclipse.microprofile.reactive.messaging.Outgoing; import org.kie.kogito.decision.DecisionModelResourcesProvider; diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java -index f6efd7ba07..33a227023b 100644 +index c836b2d634..12d3750759 100644 --- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java +++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java -@@ -15,9 +15,9 @@ +@@ -18,9 +18,9 @@ */ package org.kie.kogito.tracing.decision; @@ -3049,10 +3073,10 @@ index f6efd7ba07..33a227023b 100644 import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java -index 999d129ceb..a887b5519b 100644 +index ddad3bd54e..4a12cdbad1 100644 --- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java +++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java -@@ -15,7 +15,7 @@ +@@ -18,7 +18,7 @@ */ package org.kie.kogito.tracing.decision; @@ -3062,10 +3086,10 @@ index 999d129ceb..a887b5519b 100644 import org.eclipse.microprofile.reactive.messaging.Outgoing; import org.kie.kogito.tracing.EventEmitter; diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java -index 9a0df50ab9..af28d1a5a1 100644 +index 547c7ff509..86ce83223a 100644 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java -@@ -18,12 +18,12 @@ package org.kie.kogito.quarkus.dmn; +@@ -20,12 +20,12 @@ package org.kie.kogito.quarkus.dmn; import java.util.Map; @@ -3085,10 +3109,10 @@ index 9a0df50ab9..af28d1a5a1 100644 import org.kie.kogito.incubation.application.AppRoot; import org.kie.kogito.incubation.common.DataContext; diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/pom.xml b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/pom.xml -index 50d0cb7aae..6c32e85a60 100644 +index fe43491fb1..8b3e9445b5 100644 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/pom.xml +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/pom.xml -@@ -70,7 +70,7 @@ +@@ -90,7 +90,7 @@ io.quarkus @@ -3098,11 +3122,11 @@ index 50d0cb7aae..6c32e85a60 100644 diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java -index 39023f0739..fcb868edf2 100644 +index dc27f3b512..0880e67b40 100644 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java -@@ -16,7 +16,7 @@ - +@@ -18,7 +18,7 @@ + */ package org.kie.kogito.core.decision.incubation.quarkus.support; -import javax.enterprise.context.ApplicationScoped; @@ -3111,30 +3135,29 @@ index 39023f0739..fcb868edf2 100644 import org.kie.kogito.incubation.decisions.DecisionIds; diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java -index 3c7cf9db4b..39d6329064 100644 +index 4df9c6face..5955532e49 100644 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java -@@ -16,11 +16,11 @@ - +@@ -18,10 +18,10 @@ + */ package org.kie.kogito.core.decision.incubation.quarkus.support; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; ++import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; -+import jakarta.annotation.PostConstruct; import org.kie.kogito.decision.DecisionModels; import org.kie.kogito.incubation.common.DataContext; - import org.kie.kogito.incubation.common.ExtendedDataContext; diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java -index 5cf6bb523d..35d95e87c9 100644 +index 74c5c39f45..ac27b0fac9 100644 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java -@@ -28,8 +28,8 @@ import java.util.function.Function; +@@ -31,8 +31,8 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -3146,10 +3169,10 @@ index 5cf6bb523d..35d95e87c9 100644 import org.drools.codegen.common.DroolsModelBuildContext; import org.drools.codegen.common.GeneratedFile; diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml -index 3612fdd487..d1406ec93a 100644 +index b7353762b0..751caf201e 100644 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml -@@ -75,7 +75,7 @@ +@@ -95,7 +95,7 @@ io.quarkus @@ -3159,10 +3182,10 @@ index 3612fdd487..d1406ec93a 100644 diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java -index 4c1d53c7ae..d46f2249d3 100644 +index 8fb4babbf4..5ec28db8f0 100644 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java -@@ -20,10 +20,10 @@ import java.util.Collection; +@@ -22,10 +22,10 @@ import java.util.Collection; import java.util.Collections; import java.util.Optional; @@ -3178,10 +3201,10 @@ index 4c1d53c7ae..d46f2249d3 100644 import org.kie.kogito.auth.IdentityProvider; diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java -index e0af805b1f..2147548e66 100644 +index f928cb9a56..24be9f3449 100644 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java -@@ -17,9 +17,9 @@ package org.kie.kogito.quarkus.config; +@@ -20,9 +20,9 @@ package org.kie.kogito.quarkus.config; import java.util.Optional; @@ -3194,12 +3217,31 @@ index e0af805b1f..2147548e66 100644 import org.kie.kogito.KogitoGAV; import org.kie.kogito.config.StaticConfigBean; +diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java +index 4ec977733a..0a03ee61e8 100644 +--- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java ++++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java +@@ -18,10 +18,10 @@ + */ + package org.kie.kogito.quarkus.registry; + +-import javax.enterprise.context.ApplicationScoped; +-import javax.enterprise.event.Observes; +-import javax.enterprise.inject.Instance; +-import javax.inject.Inject; ++import jakarta.enterprise.context.ApplicationScoped; ++import jakarta.enterprise.event.Observes; ++import jakarta.enterprise.inject.Instance; ++import jakarta.inject.Inject; + + import org.kie.kogito.Application; + import org.kie.kogito.process.Processes; diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java -index e6d50f5e81..653aebc762 100644 +index 4d18223a60..9d3e90724f 100644 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java -@@ -16,8 +16,8 @@ - +@@ -18,8 +18,8 @@ + */ package org.kie.kogito.quarkus.runtime; -import javax.enterprise.context.ApplicationScoped; @@ -3210,10 +3252,10 @@ index e6d50f5e81..653aebc762 100644 import io.quarkus.arc.DefaultBean; import io.vertx.ext.web.client.WebClientOptions; diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/src/main/java/control/RestControl.java b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/src/main/java/control/RestControl.java -index a54f09d2e0..b7e7f82682 100644 +index 3fb44ee20c..2e0a9279f2 100644 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/src/main/java/control/RestControl.java +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/src/main/java/control/RestControl.java -@@ -15,11 +15,11 @@ +@@ -18,11 +18,11 @@ */ package control; @@ -3231,10 +3273,10 @@ index a54f09d2e0..b7e7f82682 100644 @Path("/control") diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/src/main/java/control/RestControl.java b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/src/main/java/control/RestControl.java -index a54f09d2e0..b7e7f82682 100644 +index 3fb44ee20c..2e0a9279f2 100644 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/src/main/java/control/RestControl.java +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/src/main/java/control/RestControl.java -@@ -15,11 +15,11 @@ +@@ -18,11 +18,11 @@ */ package control; @@ -3252,10 +3294,10 @@ index a54f09d2e0..b7e7f82682 100644 @Path("/control") diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/main/java/io/quarkus/it/kogito/jbpm/CalculationService.java b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/main/java/io/quarkus/it/kogito/jbpm/CalculationService.java -index fa64bd910a..4aac344b05 100644 +index cb8d547dba..2d90b5f644 100644 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/main/java/io/quarkus/it/kogito/jbpm/CalculationService.java +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/main/java/io/quarkus/it/kogito/jbpm/CalculationService.java -@@ -18,7 +18,7 @@ package io.quarkus.it.kogito.jbpm; +@@ -21,7 +21,7 @@ package io.quarkus.it.kogito.jbpm; import java.security.SecureRandom; import java.util.Random; @@ -3265,10 +3307,10 @@ index fa64bd910a..4aac344b05 100644 @ApplicationScoped public class CalculationService { diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java -index e19a919615..1419d03903 100644 +index 1d5033a13c..c12bae9814 100644 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java -@@ -18,8 +18,8 @@ package org.kie.kogito.quarkus.jbpm; +@@ -21,8 +21,8 @@ package org.kie.kogito.quarkus.jbpm; import java.util.HashMap; import java.util.Map; @@ -3280,10 +3322,10 @@ index e19a919615..1419d03903 100644 import org.junit.jupiter.api.Test; import org.kie.kogito.Model; diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml -index f41f347b1a..6e6c5d59c8 100644 +index bd42c3e73b..357b8df343 100644 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml -@@ -50,7 +50,7 @@ +@@ -70,7 +70,7 @@ io.quarkus @@ -3293,11 +3335,11 @@ index f41f347b1a..6e6c5d59c8 100644 diff --git a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java -index 6620bc463a..265fb4f880 100644 +index 6d4ee21f09..9cd782e06d 100644 --- a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java +++ b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java -@@ -16,9 +16,9 @@ - +@@ -18,9 +18,9 @@ + */ package org.kie.kogito.incubation.application.quarkus; -import javax.enterprise.context.ApplicationScoped; @@ -3310,10 +3352,10 @@ index 6620bc463a..265fb4f880 100644 import org.kie.kogito.incubation.application.AppRoot; import org.kie.kogito.incubation.common.ComponentRoot; diff --git a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java -index 97c1287afc..cc7a8e11ff 100644 +index ca4a9c9527..1145293a40 100644 --- a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java +++ b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java -@@ -18,7 +18,7 @@ package org.kie.kogito.incubation.common.objectmapper.quarkus; +@@ -20,7 +20,7 @@ package org.kie.kogito.incubation.common.objectmapper.quarkus; import java.util.Map; @@ -3323,10 +3365,10 @@ index 97c1287afc..cc7a8e11ff 100644 import org.kie.kogito.incubation.common.DataContext; import org.kie.kogito.incubation.common.ExtendedDataContext; diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java -index b4d754eb99..d1a28b41e2 100644 +index 4ab172fe53..904bb0f277 100644 --- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java +++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java -@@ -18,12 +18,12 @@ package org.kie.kogito.quarkus.pmml; +@@ -20,12 +20,12 @@ package org.kie.kogito.quarkus.pmml; import java.util.Map; @@ -3346,10 +3388,10 @@ index b4d754eb99..d1a28b41e2 100644 import org.kie.kogito.incubation.application.AppRoot; import org.kie.kogito.incubation.common.DataContext; diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/pom.xml b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/pom.xml -index 7dc55c08c8..0b22d355ad 100644 +index ee2a675854..a0e1e88ab6 100644 --- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/pom.xml +++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/pom.xml -@@ -42,7 +42,7 @@ +@@ -62,7 +62,7 @@ io.quarkus @@ -3359,11 +3401,11 @@ index 7dc55c08c8..0b22d355ad 100644 diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java -index 049ed0266b..0a8522f043 100644 +index b3e0792efa..bdea4a5b87 100644 --- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java +++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java -@@ -16,7 +16,7 @@ - +@@ -18,7 +18,7 @@ + */ package org.kie.kogito.core.prediction.incubation.quarkus.support; -import javax.enterprise.context.ApplicationScoped; @@ -3372,11 +3414,11 @@ index 049ed0266b..0a8522f043 100644 import org.kie.kogito.incubation.predictions.PredictionIds; diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java -index c168a06b34..3b6391cbc9 100644 +index ed5b13d980..c2c727b1f3 100644 --- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java +++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java -@@ -16,10 +16,10 @@ - +@@ -18,10 +18,10 @@ + */ package org.kie.kogito.core.prediction.incubation.quarkus.support; -import javax.annotation.PostConstruct; @@ -3391,10 +3433,10 @@ index c168a06b34..3b6391cbc9 100644 import org.kie.kogito.incubation.common.DataContext; import org.kie.kogito.incubation.common.ExtendedDataContext; diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/src/test/java/io/quarkus/it/kogito/process/HotReloadTestHelper.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/src/test/java/io/quarkus/it/kogito/process/HotReloadTestHelper.java -index afa85f97fa..48d597db45 100644 +index 41d5b44612..4b3aad3e64 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/src/test/java/io/quarkus/it/kogito/process/HotReloadTestHelper.java +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/src/test/java/io/quarkus/it/kogito/process/HotReloadTestHelper.java -@@ -15,7 +15,7 @@ +@@ -18,7 +18,7 @@ */ package io.quarkus.it.kogito.process; @@ -3404,10 +3446,10 @@ index afa85f97fa..48d597db45 100644 /** * HotReloadTestHelper diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java -index 17b400d4a5..a677c45868 100644 +index 608707a960..6b0f0863ce 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java -@@ -18,15 +18,15 @@ package org.acme; +@@ -20,15 +20,15 @@ package org.acme; import java.util.Map; @@ -3433,10 +3475,10 @@ index 17b400d4a5..a677c45868 100644 import org.kie.kogito.Model; import org.kie.kogito.incubation.application.AppRoot; diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java -index e98e388939..0903d20f57 100644 +index 3af88368d9..f0c911c32d 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java -@@ -19,7 +19,7 @@ package org.acme; +@@ -21,7 +21,7 @@ package org.acme; import java.util.List; import java.util.Map; @@ -3446,10 +3488,10 @@ index e98e388939..0903d20f57 100644 import org.junit.jupiter.api.Test; import org.kie.kogito.incubation.application.AppRoot; diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/pom.xml b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/pom.xml -index 7f4d1a6fa0..5c7e77f9cd 100644 +index ca1a41e505..569fdcb392 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/pom.xml +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/pom.xml -@@ -40,7 +40,7 @@ +@@ -60,7 +60,7 @@ io.quarkus @@ -3459,11 +3501,11 @@ index 7f4d1a6fa0..5c7e77f9cd 100644 diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java -index b544a00c13..dd476ea3e3 100644 +index 041d0992e5..e50d19ccd6 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java -@@ -16,11 +16,11 @@ - +@@ -18,11 +18,11 @@ + */ package org.kie.kogito.core.process.incubation.quarkus.support; -import javax.annotation.PostConstruct; @@ -3479,11 +3521,11 @@ index b544a00c13..dd476ea3e3 100644 import org.kie.kogito.incubation.common.DataContext; import org.kie.kogito.incubation.common.ExtendedDataContext; diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java -index 1a037d855e..b6b1fdd7db 100644 +index 7ea23a236f..dac1728920 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java -@@ -16,7 +16,7 @@ - +@@ -18,7 +18,7 @@ + */ package org.kie.kogito.core.process.incubation.quarkus.support; -import javax.enterprise.context.ApplicationScoped; @@ -3492,11 +3534,11 @@ index 1a037d855e..b6b1fdd7db 100644 import org.kie.kogito.incubation.processes.ProcessIds; diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java -index 806d8b690c..302011ee7f 100644 +index 2e40f0f880..0e2d7dff0d 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java -@@ -16,11 +16,11 @@ - +@@ -18,11 +18,11 @@ + */ package org.kie.kogito.core.process.incubation.quarkus.support; -import javax.annotation.PostConstruct; @@ -3512,11 +3554,11 @@ index 806d8b690c..302011ee7f 100644 import org.kie.kogito.incubation.common.DataContext; import org.kie.kogito.incubation.common.ExtendedDataContext; diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java -index 1f66512e9f..807d060370 100644 +index 3f009c5579..0875bfbc3c 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java -@@ -16,11 +16,11 @@ - +@@ -18,11 +18,11 @@ + */ package org.kie.kogito.core.process.incubation.quarkus.support; -import javax.annotation.PostConstruct; @@ -3532,10 +3574,10 @@ index 1f66512e9f..807d060370 100644 import org.kie.kogito.incubation.common.Id; import org.kie.kogito.incubation.processes.services.StraightThroughProcessService; diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java -index 93979d672b..5aa0d04570 100644 +index 66a42383c3..5ab246a52d 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.quarkus.drools; @@ -3547,10 +3589,10 @@ index 93979d672b..5aa0d04570 100644 import org.drools.ruleunits.api.DataStore; import org.drools.ruleunits.api.RuleUnitData; diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java -index 6a1abd751f..57876ca809 100644 +index c249f1faf0..a6d15cf7e8 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java -@@ -19,12 +19,12 @@ package org.kie.kogito.quarkus.drools; +@@ -21,12 +21,12 @@ package org.kie.kogito.quarkus.drools; import java.util.Map; import java.util.Optional; @@ -3570,10 +3612,10 @@ index 6a1abd751f..57876ca809 100644 import org.kie.kogito.incubation.application.AppRoot; import org.kie.kogito.incubation.common.DataContext; diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java -index 2f25251277..c5bfb4e3cc 100644 +index 21ea877b5d..3673790aad 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java -@@ -17,7 +17,7 @@ package org.kie.kogito.quarkus.drools; +@@ -20,7 +20,7 @@ package org.kie.kogito.quarkus.drools; import java.util.Map; @@ -3583,10 +3625,10 @@ index 2f25251277..c5bfb4e3cc 100644 import org.junit.jupiter.api.Test; import org.kie.kogito.incubation.common.EmptyDataContext; diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java -index f748c5d240..eae5b1a543 100644 +index a9e445e1b8..6b273c673e 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java -@@ -19,7 +19,7 @@ import java.util.List; +@@ -22,7 +22,7 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -3596,10 +3638,10 @@ index f748c5d240..eae5b1a543 100644 import org.drools.ruleunits.api.DataSource; import org.junit.jupiter.api.Test; diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml -index 790727329c..e1d80e9abb 100644 +index 7f8290145d..ebdc6a35f5 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml -@@ -45,7 +45,7 @@ +@@ -65,7 +65,7 @@ io.quarkus @@ -3609,10 +3651,10 @@ index 790727329c..e1d80e9abb 100644 diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java -index f79b9b275c..a2e4368642 100644 +index 20991fef11..50c0b4724a 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.core.rules.incubation.quarkus.support; @@ -3624,10 +3666,10 @@ index f79b9b275c..a2e4368642 100644 import org.drools.ruleunits.api.DataSource; import org.drools.ruleunits.api.DataStore; diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java -index 745a82c7a5..29926d40e0 100644 +index d4e780492e..d5cc44b16e 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java -@@ -15,11 +15,11 @@ +@@ -18,11 +18,11 @@ */ package org.kie.kogito.core.rules.incubation.quarkus.support; @@ -3644,11 +3686,11 @@ index 745a82c7a5..29926d40e0 100644 import org.kie.kogito.incubation.common.LocalId; import org.kie.kogito.incubation.rules.data.DataId; diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java -index 29d477383c..cffab27b70 100644 +index 8fd6c24146..6ec9b87446 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java -@@ -16,7 +16,7 @@ - +@@ -18,7 +18,7 @@ + */ package org.kie.kogito.core.rules.incubation.quarkus.support; -import javax.enterprise.context.ApplicationScoped; @@ -3657,10 +3699,10 @@ index 29d477383c..cffab27b70 100644 import org.kie.kogito.incubation.rules.RuleUnitIds; diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java -index 8365343e6a..a6b55dd0b9 100644 +index 80368286a2..5fe045b532 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java -@@ -18,11 +18,11 @@ package org.kie.kogito.core.rules.incubation.quarkus.support; +@@ -20,11 +20,11 @@ package org.kie.kogito.core.rules.incubation.quarkus.support; import java.util.stream.Stream; @@ -3677,10 +3719,10 @@ index 8365343e6a..a6b55dd0b9 100644 import org.kie.kogito.incubation.common.DataContext; import org.kie.kogito.incubation.common.Id; diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java -index 512ab03669..943b6c197b 100644 +index 842cb11c73..0019bdad1e 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java -@@ -17,11 +17,11 @@ package org.kie.kogito.core.rules.incubation.quarkus.support; +@@ -20,11 +20,11 @@ package org.kie.kogito.core.rules.incubation.quarkus.support; import java.util.stream.Stream; @@ -3697,11 +3739,11 @@ index 512ab03669..943b6c197b 100644 import org.kie.kogito.incubation.common.ExtendedReferenceContext; import org.kie.kogito.incubation.common.LocalId; diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java -index 6c3bc7471b..6d23aa87de 100644 +index e5bb3dd487..05071bef84 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java -@@ -16,7 +16,7 @@ - +@@ -18,7 +18,7 @@ + */ package org.kie.kogito.core.rules.incubation.quarkus.support; -import javax.enterprise.context.ApplicationScoped; @@ -3710,10 +3752,10 @@ 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 +index 73f2ecc13b..8a7edf8736 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; +@@ -27,9 +27,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; @@ -3727,10 +3769,10 @@ index c44ad0c604..c476df0aa1 100644 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 4940e8a246..7be51afdd0 100644 +index ba1fa4ba9b..765cbcf449 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 -@@ -27,7 +27,7 @@ import java.util.ServiceLoader; +@@ -30,7 +30,7 @@ import java.util.ServiceLoader; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -3740,10 +3782,10 @@ 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 315815dde1..e89e5681d7 100644 +index f502b34a83..b14f123a0b 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,8 +19,8 @@ import java.lang.annotation.Annotation; +@@ -22,8 +22,8 @@ import java.lang.annotation.Annotation; import java.util.Map; import java.util.stream.Stream; @@ -3755,10 +3797,10 @@ index 315815dde1..e89e5681d7 100644 import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java -index f3669957d8..cb8ac2d291 100644 +index 37127f0604..e6144f96c4 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java -@@ -19,8 +19,8 @@ import java.util.Collection; +@@ -22,8 +22,8 @@ import java.util.Collection; import java.util.Collections; import java.util.stream.Collectors; @@ -3770,10 +3812,10 @@ index f3669957d8..cb8ac2d291 100644 import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.jandex.IndexView; diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java -index 4ca73cc492..e98166a412 100644 +index 30a50a9eef..881d80ea18 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java -@@ -18,10 +18,11 @@ package org.kie.kogito.serverless.workflow.io; +@@ -21,10 +21,11 @@ package org.kie.kogito.serverless.workflow.io; import java.net.URI; import java.util.function.Function; @@ -3788,10 +3830,10 @@ index 4ca73cc492..e98166a412 100644 import io.quarkus.runtime.Startup; diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/AgePersonService.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/AgePersonService.java -index 509b193727..2b0fa6b37f 100644 +index 38415e9b46..91a4f9e910 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/AgePersonService.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/AgePersonService.java -@@ -17,7 +17,7 @@ package org.kie.kogito.workflows.services; +@@ -20,7 +20,7 @@ package org.kie.kogito.workflows.services; import java.util.Date; @@ -3801,10 +3843,10 @@ index 509b193727..2b0fa6b37f 100644 @ApplicationScoped public class AgePersonService { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/EvenService.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/EvenService.java -index dc3118ee0d..177ea936b4 100644 +index 10bcefb642..13f31b359c 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/EvenService.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/EvenService.java -@@ -15,7 +15,7 @@ +@@ -18,7 +18,7 @@ */ package org.kie.kogito.workflows.services; @@ -3814,10 +3856,10 @@ index dc3118ee0d..177ea936b4 100644 @ApplicationScoped public class EvenService { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java -index 48da214211..ad0690a10e 100644 +index 838f60172b..12f949e1c3 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java -@@ -18,13 +18,13 @@ package org.kie.kogito.workflows.services; +@@ -20,13 +20,13 @@ package org.kie.kogito.workflows.services; import java.util.Map; @@ -3839,11 +3881,11 @@ index 48da214211..ad0690a10e 100644 import org.kie.kogito.Model; import org.kie.kogito.process.Process; diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java -index a8bbd59754..926bdf0a01 100644 +index d9175ba155..5e4db1e3bc 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java -@@ -16,10 +16,10 @@ - +@@ -18,10 +18,10 @@ + */ package org.kie.kogito.workflows.services; -import javax.enterprise.context.ApplicationScoped; @@ -3858,11 +3900,11 @@ index a8bbd59754..926bdf0a01 100644 import org.kie.kogito.addon.quarkus.messaging.common.ChannelFormat; import org.kie.kogito.event.CloudEventUnmarshallerFactory; diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java -index 0823a2e051..9c0eccaadd 100644 +index abe000d6f7..419aa07937 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java -@@ -16,7 +16,7 @@ - +@@ -18,7 +18,7 @@ + */ package org.kie.kogito.workflows.services; -import javax.enterprise.context.ApplicationScoped; @@ -3871,10 +3913,10 @@ index 0823a2e051..9c0eccaadd 100644 import org.kie.api.event.process.ProcessNodeLeftEvent; import org.kie.kogito.internal.process.event.DefaultKogitoProcessEventListener; diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/PersonService.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/PersonService.java -index bdd7d1720c..7e552f59ef 100644 +index 7011b3f04f..36197c0232 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/PersonService.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/PersonService.java -@@ -15,7 +15,7 @@ +@@ -18,7 +18,7 @@ */ package org.kie.kogito.workflows.services; @@ -3884,10 +3926,10 @@ index bdd7d1720c..7e552f59ef 100644 @ApplicationScoped public class PersonService { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java -index a6c5a651fa..f0dd659b43 100644 +index 942c0709d8..2851f80580 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java -@@ -17,7 +17,7 @@ package org.kie.kogito.workflows.services; +@@ -20,7 +20,7 @@ package org.kie.kogito.workflows.services; import java.util.Map; @@ -3897,10 +3939,10 @@ index a6c5a651fa..f0dd659b43 100644 import org.kie.kogito.internal.process.runtime.KogitoWorkItem; import org.kie.kogito.serverless.workflow.WorkflowWorkItemHandler; diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java -index 6912f78a63..4dd30499c3 100644 +index 40748ec9fb..a33e0658d6 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java -@@ -15,10 +15,10 @@ +@@ -18,10 +18,10 @@ */ package org.kie.kogito.workflows.services; @@ -3915,10 +3957,10 @@ index 6912f78a63..4dd30499c3 100644 @ApplicationScoped diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/SquareService.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/SquareService.java -index 36bf8b0aea..935196b5b6 100644 +index 4a93f89081..f72348a510 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/SquareService.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/SquareService.java -@@ -18,7 +18,7 @@ package org.kie.kogito.workflows.services; +@@ -21,7 +21,7 @@ package org.kie.kogito.workflows.services; import java.util.Collection; import java.util.stream.Collectors; @@ -3928,10 +3970,10 @@ index 36bf8b0aea..935196b5b6 100644 @ApplicationScoped public class SquareService { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ExternalServiceMock.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ExternalServiceMock.java -index 65062209a1..d153dc8aec 100644 +index 007127ec48..7ffa1481b7 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ExternalServiceMock.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ExternalServiceMock.java -@@ -31,8 +31,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson; +@@ -33,8 +33,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; @@ -3943,10 +3985,10 @@ index 65062209a1..d153dc8aec 100644 public class ExternalServiceMock implements QuarkusTestResourceLifecycleManager { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/KeycloakServiceMock.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/KeycloakServiceMock.java -index be7ad20898..0bde93b19a 100644 +index 5bd6325ac3..67d3d66bcc 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/KeycloakServiceMock.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/KeycloakServiceMock.java -@@ -28,9 +28,9 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; +@@ -31,9 +31,9 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; @@ -3960,10 +4002,10 @@ index be7ad20898..0bde93b19a 100644 /** * Lightweight Keycloak mock to use when an OidcClient is required, and we don't want/need to start a full Keycloak diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java -index 4664345ac0..7a143bd0f8 100644 +index 93f7844f2b..8457c1846f 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java -@@ -18,7 +18,7 @@ package org.kie.kogito.quarkus.workflows; +@@ -21,7 +21,7 @@ package org.kie.kogito.quarkus.workflows; import java.time.Duration; import java.util.UUID; @@ -3973,10 +4015,10 @@ index 4664345ac0..7a143bd0f8 100644 import org.junit.jupiter.api.Test; diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java -index a28a8819d5..654097b817 100644 +index 0802aed3d1..0c42b4214a 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java -@@ -19,7 +19,7 @@ package org.kie.kogito.quarkus.workflows; +@@ -21,7 +21,7 @@ package org.kie.kogito.quarkus.workflows; import java.util.Collections; import java.util.Map; @@ -3985,7 +4027,7 @@ index a28a8819d5..654097b817 100644 import com.github.tomakehurst.wiremock.WireMockServer; -@@ -31,8 +31,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; +@@ -33,8 +33,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; @@ -3997,10 +4039,10 @@ index a28a8819d5..654097b817 100644 public class TokenPropagationExternalServicesMock implements QuarkusTestResourceLifecycleManager { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java -index c8cbb16e26..13b3381075 100644 +index 12c7faa5b6..d7194e46fe 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java -@@ -19,7 +19,7 @@ package org.kie.kogito.quarkus.workflows; +@@ -21,7 +21,7 @@ package org.kie.kogito.quarkus.workflows; import java.util.HashMap; import java.util.Map; @@ -4023,10 +4065,10 @@ index 2f0c60b687..4022c85adb 100644 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java -index f7aac47075..26198b71e0 100644 +index 9070b5e922..2ed35472f4 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java -@@ -15,11 +15,10 @@ +@@ -18,11 +18,11 @@ */ package org.kie.kogito.expr.jq; @@ -4035,20 +4077,19 @@ index f7aac47075..26198b71e0 100644 +import jakarta.inject.Inject; import io.quarkus.runtime.Startup; -- + +import jakarta.annotation.PostConstruct; import net.thisptr.jackson.jq.Scope; @Startup diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java -index 633f653b51..efbde37ba8 100644 +index 9fa0551c10..33fc2e550c 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java -@@ -14,9 +14,7 @@ - * limitations under the License. +@@ -18,8 +18,7 @@ */ package org.kie.kogito.secret; -- + -import javax.annotation.PostConstruct; - +import jakarta.annotation.PostConstruct; @@ -4056,11 +4097,11 @@ index 633f653b51..efbde37ba8 100644 import io.quarkus.runtime.Startup; diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java -index af5f61d1f0..767c7ea624 100644 +index 54c0614393..9d5030bd2f 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java -@@ -16,11 +16,11 @@ - +@@ -18,11 +18,11 @@ + */ package org.kie.kogito.serverless.workflow.config; -import javax.annotation.PostConstruct; @@ -4076,10 +4117,10 @@ index af5f61d1f0..767c7ea624 100644 import org.kie.kogito.serverless.workflow.WorkflowWorkItemHandler; import org.slf4j.Logger; diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java -index 128d514ba0..0a3adc2946 100644 +index d07051612e..b6d051eebe 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java -@@ -15,7 +15,7 @@ +@@ -18,7 +18,7 @@ */ package org.kie.kogito.serverless.workflow.mapper; @@ -4089,10 +4130,10 @@ index 128d514ba0..0a3adc2946 100644 import org.kie.kogito.jackson.utils.JsonNodeFactoryListener; diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java -index dcbc67d4a7..56149fd8a8 100644 +index 6ef78bbf19..c2929e721b 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java -@@ -20,9 +20,9 @@ import java.lang.reflect.ParameterizedType; +@@ -23,9 +23,9 @@ import java.lang.reflect.ParameterizedType; import java.util.Collections; import java.util.Map; @@ -4106,10 +4147,10 @@ index dcbc67d4a7..56149fd8a8 100644 import org.kie.kogito.event.cloudevents.extension.ProcessMeta; import org.kie.kogito.internal.process.runtime.KogitoWorkItem; diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java -index 99e6bd898a..2994328d72 100644 +index 26a0a3c852..e9b6c51100 100644 --- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java +++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java -@@ -17,9 +17,9 @@ package org.kie.kogito.quarkus.workflow; +@@ -20,9 +20,9 @@ package org.kie.kogito.quarkus.workflow; import java.util.concurrent.ScheduledExecutorService; @@ -4123,10 +4164,10 @@ index 99e6bd898a..2994328d72 100644 import org.kie.kogito.config.ConfigBean; import org.kie.kogito.correlation.CorrelationService; diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java -index d4216b1cc3..41a44c6592 100644 +index bf02d1fa33..69b83fc1bd 100644 --- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java +++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java -@@ -19,9 +19,9 @@ package org.kie.kogito.quarkus.workflow.devservices; +@@ -21,9 +21,9 @@ package org.kie.kogito.quarkus.workflow.devservices; import java.util.Collection; import java.util.Optional; @@ -4139,10 +4180,10 @@ index d4216b1cc3..41a44c6592 100644 import org.kie.kogito.event.DataEvent; import org.kie.kogito.event.EventPublisher; diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java -index bb23b74c6a..5b6e48e020 100644 +index 56552ca660..d8701e2c33 100644 --- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java +++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java -@@ -20,8 +20,8 @@ import java.util.concurrent.ScheduledFuture; +@@ -22,8 +22,8 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; @@ -4154,10 +4195,10 @@ index bb23b74c6a..5b6e48e020 100644 import org.eclipse.microprofile.context.ThreadContext; import org.kie.kogito.services.jobs.impl.InMemoryJobService; diff --git a/quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/src/test/java/org/acme/travels/PersonProcessTest.java b/quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/src/test/java/org/acme/travels/PersonProcessTest.java -index 9a8f24e3b8..2bfa200841 100644 +index fe93bfc22d..09baf63f1a 100644 --- a/quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/src/test/java/org/acme/travels/PersonProcessTest.java +++ b/quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/src/test/java/org/acme/travels/PersonProcessTest.java -@@ -23,8 +23,8 @@ import java.util.HashMap; +@@ -26,8 +26,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; @@ -4169,10 +4210,10 @@ index 9a8f24e3b8..2bfa200841 100644 import org.junit.jupiter.api.Test; import org.kie.kogito.Model; diff --git a/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java b/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java -index 1b82df7f43..f7595d1337 100644 +index 02276572fb..5585554ba5 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java +++ b/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java -@@ -15,7 +15,7 @@ +@@ -18,7 +18,7 @@ */ package org.kie.kogito.integrationtests; @@ -4182,10 +4223,10 @@ index 1b82df7f43..f7595d1337 100644 import org.kie.kogito.Application; import org.kie.kogito.decision.DecisionConfig; diff --git a/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java b/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java -index fc7c733c6a..c151b850f2 100644 +index 589908d1d9..5763a15314 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java +++ b/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java -@@ -15,12 +15,12 @@ +@@ -18,12 +18,12 @@ */ package org.kie.kogito.legacy.rules; @@ -4202,10 +4243,10 @@ index fc7c733c6a..c151b850f2 100644 import org.kie.api.runtime.KieRuntimeBuilder; import org.kie.api.runtime.KieSession; diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java -index 3c7c37692c..e8bc6621b7 100644 +index 4d86f0a465..146f7d6eaa 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java +++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java -@@ -18,7 +18,7 @@ package org.kie.kogito.quarkus.dmn; +@@ -21,7 +21,7 @@ package org.kie.kogito.quarkus.dmn; import java.util.HashMap; import java.util.Map; @@ -4215,10 +4256,10 @@ index 3c7c37692c..e8bc6621b7 100644 import org.junit.jupiter.api.Test; import org.kie.dmn.api.core.DMNResult; diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java -index 889297c7de..fc16ed3100 100644 +index 0ab9fb60d2..2235b94b67 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java +++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java -@@ -19,7 +19,7 @@ import java.util.List; +@@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -4228,10 +4269,10 @@ index 889297c7de..fc16ed3100 100644 import org.drools.ruleunits.api.RuleUnit; import org.drools.ruleunits.api.RuleUnitInstance; diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java -index 801e347eb1..b5f41bc4b0 100644 +index 7cbcbf9f89..2dbbb9ca44 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java +++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java -@@ -18,8 +18,8 @@ package org.kie.kogito.quarkus.jbpm; +@@ -21,8 +21,8 @@ package org.kie.kogito.quarkus.jbpm; import java.util.HashMap; import java.util.Map; @@ -4243,10 +4284,10 @@ index 801e347eb1..b5f41bc4b0 100644 import org.junit.jupiter.api.Test; import org.kie.kogito.Model; diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java -index c98969bc15..a39f4dab3a 100644 +index f994995181..54f197106d 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java +++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java -@@ -18,7 +18,7 @@ package org.kie.kogito.quarkus.pmml; +@@ -21,7 +21,7 @@ package org.kie.kogito.quarkus.pmml; import java.util.HashMap; import java.util.Map; @@ -4256,10 +4297,10 @@ index c98969bc15..a39f4dab3a 100644 import org.assertj.core.data.Offset; import org.junit.jupiter.api.Test; diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java -index 99b30ac17f..5b6fa14e9e 100644 +index e998425a4c..4e81f33110 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java -@@ -17,7 +17,7 @@ package org.kie.kogito; +@@ -20,7 +20,7 @@ package org.kie.kogito; import java.io.IOException; @@ -4269,11 +4310,11 @@ index 99b30ac17f..5b6fa14e9e 100644 import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java -index 44abbe8aed..a2eebd6c1b 100644 +index 641a4f922a..91629e1559 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java -@@ -16,7 +16,7 @@ - +@@ -18,7 +18,7 @@ + */ package org.kie.kogito; -import javax.enterprise.context.ApplicationScoped; @@ -4282,10 +4323,10 @@ index 44abbe8aed..a2eebd6c1b 100644 import org.kie.api.event.process.ProcessNodeLeftEvent; import org.kie.kogito.internal.process.event.DefaultKogitoProcessEventListener; diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java -index 950134a0d3..4d09e25ca5 100644 +index abd03d0669..31c65cd8d0 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java -@@ -15,7 +15,7 @@ +@@ -18,7 +18,7 @@ */ package org.kie.kogito.wih; @@ -4295,10 +4336,10 @@ index 950134a0d3..4d09e25ca5 100644 import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig; diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java -index b46eefab97..3ff04416a9 100644 +index ba823a3788..1ea029587c 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java -@@ -15,7 +15,7 @@ +@@ -18,7 +18,7 @@ */ package org.acme; @@ -4308,10 +4349,10 @@ index b46eefab97..3ff04416a9 100644 import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig; diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java -index 2f55304136..b529b767ac 100644 +index e3de3ba4b9..f8ec56ee6a 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java -@@ -18,14 +18,14 @@ package org.kie.kogito.integrationtests; +@@ -20,14 +20,14 @@ package org.kie.kogito.integrationtests; import java.util.Map; @@ -4335,10 +4376,10 @@ index 2f55304136..b529b767ac 100644 import org.kie.kogito.Model; import org.kie.kogito.process.Process; diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/EventListenerResource.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/EventListenerResource.java -index ad9fcf92e7..d8e741d714 100644 +index 9498c0e032..031fbc0759 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/EventListenerResource.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/EventListenerResource.java -@@ -19,12 +19,12 @@ package org.kie.kogito.integrationtests; +@@ -21,12 +21,12 @@ package org.kie.kogito.integrationtests; import java.util.HashMap; import java.util.Map; @@ -4358,10 +4399,10 @@ index ad9fcf92e7..d8e741d714 100644 @Path("/events") @Produces(MediaType.APPLICATION_JSON) diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java -index 407dd562f3..4d42a1ff24 100755 +index 7cc318736f..026e1caad3 100755 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java -@@ -17,7 +17,7 @@ package org.kie.kogito.integrationtests; +@@ -20,7 +20,7 @@ package org.kie.kogito.integrationtests; import java.io.IOException; @@ -4371,10 +4412,10 @@ index 407dd562f3..4d42a1ff24 100755 import org.kie.kogito.integrationtests.excetpion.ServiceException; import org.slf4j.Logger; diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java -index 9153cb6f83..31aed8f893 100644 +index 86dcce9cf3..919b2ef874 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java -@@ -15,7 +15,7 @@ +@@ -18,7 +18,7 @@ */ package org.kie.kogito.integrationtests; @@ -4384,11 +4425,11 @@ index 9153cb6f83..31aed8f893 100644 import org.kie.kogito.Application; import org.kie.kogito.process.ProcessConfig; diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java -index 11f3fb7952..2a42e77dee 100644 +index 171e26f73d..28a845f88f 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java -@@ -16,7 +16,7 @@ - +@@ -18,7 +18,7 @@ + */ package org.kie.kogito.integrationtests; -import javax.enterprise.context.ApplicationScoped; @@ -4397,10 +4438,10 @@ index 11f3fb7952..2a42e77dee 100644 import org.kie.api.event.process.ProcessNodeLeftEvent; import org.kie.kogito.internal.process.event.DefaultKogitoProcessEventListener; diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java -index 018115ac57..866eec1fe4 100644 +index 1b7f2c85d1..818720a584 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java -@@ -19,7 +19,7 @@ package org.kie.kogito.integrationtests; +@@ -21,7 +21,7 @@ package org.kie.kogito.integrationtests; import java.util.ArrayList; import java.util.List; @@ -4410,10 +4451,10 @@ index 018115ac57..866eec1fe4 100644 import org.kie.kogito.uow.events.UnitOfWorkAbortEvent; import org.kie.kogito.uow.events.UnitOfWorkEndEvent; diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java -index 59f6147d63..e564a0d7c2 100644 +index 448036c580..662b572bf8 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java -@@ -23,7 +23,7 @@ import java.util.Collections; +@@ -26,7 +26,7 @@ import java.util.Collections; import java.util.Map; import java.util.Set; @@ -4423,10 +4464,10 @@ index 59f6147d63..e564a0d7c2 100644 import org.acme.travels.Traveller; import org.junit.jupiter.api.Test; diff --git a/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java b/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java -index a1aa6749ff..7a969aed5e 100644 +index 13e4d2789b..74309f3c16 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java +++ b/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java -@@ -15,7 +15,7 @@ +@@ -18,7 +18,7 @@ */ package org.kie.kogito.integrationtests; @@ -4436,10 +4477,10 @@ index a1aa6749ff..7a969aed5e 100644 import org.kie.kogito.Application; import org.kie.kogito.rules.RuleConfig; diff --git a/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java b/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java -index 2d2627a412..51acce14b8 100644 +index d15814e745..effee0cf27 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java +++ b/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java -@@ -17,7 +17,7 @@ package org.kie.kogito.examples; +@@ -20,7 +20,7 @@ package org.kie.kogito.examples; import java.util.Random; @@ -4449,10 +4490,10 @@ index 2d2627a412..51acce14b8 100644 import org.kie.kogito.examples.demo.Order; diff --git a/quarkus/test/src/main/java/org/kie/kogito/test/quarkus/QuarkusTestProperty.java b/quarkus/test/src/main/java/org/kie/kogito/test/quarkus/QuarkusTestProperty.java -index 0e56b7f4c1..1f6d444cc9 100644 +index fa81bad963..1fce37229b 100644 --- a/quarkus/test/src/main/java/org/kie/kogito/test/quarkus/QuarkusTestProperty.java +++ b/quarkus/test/src/main/java/org/kie/kogito/test/quarkus/QuarkusTestProperty.java -@@ -19,7 +19,7 @@ package org.kie.kogito.test.quarkus; +@@ -21,7 +21,7 @@ package org.kie.kogito.test.quarkus; import java.lang.annotation.Retention; import java.lang.annotation.Target; @@ -4462,10 +4503,10 @@ index 0e56b7f4c1..1f6d444cc9 100644 import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java b/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java -index 08e30d5db9..b15e15a4d3 100644 +index e081fccc33..8b6513edf2 100644 --- a/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java +++ b/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java -@@ -20,8 +20,7 @@ import java.util.Collections; +@@ -23,8 +23,7 @@ import java.util.Collections; import java.util.Map; import java.util.Optional; @@ -4476,10 +4517,10 @@ index 08e30d5db9..b15e15a4d3 100644 import org.testcontainers.containers.Container; diff --git a/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java b/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java -index bacb17a6be..ebcc399a59 100644 +index 4dc9222f13..1f22146992 100644 --- a/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java +++ b/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java -@@ -18,8 +18,7 @@ package org.kie.kogito.test.resources; +@@ -21,8 +21,7 @@ package org.kie.kogito.test.resources; import java.util.Collections; import java.util.Map; @@ -4490,10 +4531,10 @@ index bacb17a6be..ebcc399a59 100644 import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java b/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java -index 8188a297f6..1486a4b523 100644 +index 813b8448b5..9b38468d83 100644 --- a/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java +++ b/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java -@@ -15,8 +15,7 @@ +@@ -18,8 +18,7 @@ */ package org.kie.kogito.eventdriven.decision; @@ -4504,11 +4545,11 @@ index 8188a297f6..1486a4b523 100644 import org.kie.kogito.decision.DecisionModels; import org.kie.kogito.event.EventEmitter; diff --git a/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java b/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java -index e9280cdeda..6c15897b1a 100644 +index 8ab43d6c7e..e08186b651 100644 --- a/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java +++ b/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java -@@ -16,8 +16,7 @@ - +@@ -18,8 +18,7 @@ + */ package org.kie.kogito.events.mongodb; -import javax.annotation.PostConstruct; @@ -4518,10 +4559,10 @@ index e9280cdeda..6c15897b1a 100644 import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java b/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java -index 4cbb0cd60b..0fd5c48b70 100644 +index ede3ff7785..14a6d41dfc 100644 --- a/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java +++ b/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java -@@ -15,8 +15,7 @@ +@@ -18,8 +18,7 @@ */ package org.kie.kogito.eventdriven.predictions; @@ -4532,10 +4573,10 @@ index 4cbb0cd60b..0fd5c48b70 100644 import org.kie.kogito.event.EventEmitter; import org.kie.kogito.event.EventReceiver; diff --git a/springboot/addons/jobs/pom.xml b/springboot/addons/jobs/pom.xml -index ec8e361691..0abe916c34 100644 +index 8a5537d588..c61418cb3f 100644 --- a/springboot/addons/jobs/pom.xml +++ b/springboot/addons/jobs/pom.xml -@@ -33,8 +33,8 @@ +@@ -53,8 +53,8 @@ kogito-spring-boot-starter @@ -4547,10 +4588,10 @@ index ec8e361691..0abe916c34 100644 org.slf4j diff --git a/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java b/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java -index 5c27e4c987..81e7c521de 100644 +index d143618383..a4902cead8 100644 --- a/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java +++ b/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java -@@ -15,8 +15,7 @@ +@@ -18,8 +18,7 @@ */ package org.kie.kogito.jobs.management.springboot; @@ -4561,10 +4602,10 @@ index 5c27e4c987..81e7c521de 100644 import org.kie.kogito.jobs.ProcessJobDescription; import org.kie.kogito.jobs.management.RestJobsService; diff --git a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java -index 97b9d51aac..1d51253270 100644 +index cc049ab883..4264e3fd48 100644 --- a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java +++ b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java -@@ -15,8 +15,7 @@ +@@ -18,8 +18,7 @@ */ package org.kie.kogito.addon.cloudevents.spring; @@ -4575,10 +4616,10 @@ index 97b9d51aac..1d51253270 100644 import org.kie.kogito.event.cloudevents.extension.KogitoPredictionsExtension; import org.kie.kogito.event.cloudevents.extension.KogitoProcessExtension; diff --git a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java -index 6e5523f955..74f5aa9067 100644 +index 349d576ea6..5330d48cc8 100644 --- a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java +++ b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java -@@ -23,8 +23,7 @@ import java.util.concurrent.CopyOnWriteArrayList; +@@ -26,8 +26,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ExecutionException; import java.util.function.Function; @@ -4589,10 +4630,10 @@ index 6e5523f955..74f5aa9067 100644 import org.kie.kogito.event.CloudEventUnmarshallerFactory; import org.kie.kogito.event.DataEvent; diff --git a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java -index 30ae90d94c..ec2410eacd 100644 +index 8428936c05..14b64f3ab4 100644 --- a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java +++ b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java -@@ -15,8 +15,8 @@ +@@ -18,8 +18,8 @@ */ package org.kie.kogito.monitoring.core.springboot; @@ -4604,10 +4645,10 @@ index 30ae90d94c..ec2410eacd 100644 import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor; import org.springframework.lang.Nullable; diff --git a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java -index 1d869f7924..50aa932af6 100644 +index 2742bfaab2..fb29872dcc 100644 --- a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java +++ b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java -@@ -15,8 +15,7 @@ +@@ -18,8 +18,7 @@ */ package org.kie.kogito.monitoring.core.springboot; @@ -4618,10 +4659,10 @@ index 1d869f7924..50aa932af6 100644 import org.kie.kogito.config.ConfigBean; import org.kie.kogito.monitoring.core.common.system.metrics.SystemMetricsCollector; diff --git a/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java b/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java -index 4cacb54001..996815f8a7 100644 +index 761ce48615..f1f7063f33 100644 --- a/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java +++ b/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java -@@ -17,8 +17,8 @@ package org.kie.kogito.monitoring.core.springboot; +@@ -20,8 +20,8 @@ package org.kie.kogito.monitoring.core.springboot; import java.util.List; @@ -4633,10 +4674,10 @@ index 4cacb54001..996815f8a7 100644 import org.junit.jupiter.api.Test; import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor; diff --git a/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java b/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java -index bf643296a0..ec8ad4e9c2 100644 +index 7dff7614e1..bbec67fe8c 100644 --- a/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java +++ b/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java -@@ -15,8 +15,7 @@ +@@ -18,8 +18,7 @@ */ package org.kie.kogito.monitoring.elastic.springboot; @@ -4647,10 +4688,10 @@ index bf643296a0..ec8ad4e9c2 100644 import org.kie.kogito.monitoring.elastic.common.ElasticRegistry; import org.kie.kogito.monitoring.elastic.common.KogitoElasticConfig; diff --git a/springboot/addons/process-svg/pom.xml b/springboot/addons/process-svg/pom.xml -index 96f541caac..a1a275b651 100644 +index 4ee9fa3172..ff6a94dbdd 100644 --- a/springboot/addons/process-svg/pom.xml +++ b/springboot/addons/process-svg/pom.xml -@@ -47,8 +47,8 @@ +@@ -67,8 +67,8 @@ provided @@ -4662,10 +4703,10 @@ index 96f541caac..a1a275b651 100644 org.slf4j diff --git a/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java b/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java -index a0919f003a..fd9c31ee5f 100644 +index ae7baf53b8..69f490e5ce 100644 --- a/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java +++ b/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java -@@ -19,8 +19,7 @@ package org.kie.kogito.svg.dataindex; +@@ -21,8 +21,7 @@ package org.kie.kogito.svg.dataindex; import java.util.ArrayList; import java.util.List; @@ -4676,10 +4717,10 @@ index a0919f003a..fd9c31ee5f 100644 import org.kie.kogito.svg.ProcessSVGException; import org.slf4j.Logger; diff --git a/springboot/addons/tracing-decision/pom.xml b/springboot/addons/tracing-decision/pom.xml -index 1896563401..e13646549a 100644 +index 01db69293a..fa79d6152d 100644 --- a/springboot/addons/tracing-decision/pom.xml +++ b/springboot/addons/tracing-decision/pom.xml -@@ -29,8 +29,8 @@ +@@ -49,8 +49,8 @@ @@ -4691,10 +4732,10 @@ index 1896563401..e13646549a 100644 diff --git a/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java b/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java -index 5b7f0e8a75..712d3d1e17 100644 +index b40973043d..da10bdb18b 100644 --- a/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java +++ b/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java -@@ -15,8 +15,7 @@ +@@ -18,8 +18,7 @@ */ package org.kie.kogito.tracing.decision; @@ -4705,10 +4746,10 @@ 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 898384e80d..929f2d93ba 100644 --- a/springboot/bom/pom.xml +++ b/springboot/bom/pom.xml -@@ -22,10 +22,9 @@ +@@ -42,10 +42,9 @@ 2.4.16 1.3-groovy-2.4 @@ -4720,7 +4761,7 @@ index 8247d78ce6..10b6eff566 100644 -@@ -63,11 +62,6 @@ +@@ -83,11 +82,6 @@ spring-cloud-starter-kubernetes-fabric8 ${version.org.springframework.cloud.kubernetes.fabric8} @@ -4733,10 +4774,10 @@ index 8247d78ce6..10b6eff566 100644 diff --git a/springboot/starters/pom.xml b/springboot/starters/pom.xml -index 97d40cc694..657f222c75 100644 +index 6e7adc0e41..91a0cb673a 100644 --- a/springboot/starters/pom.xml +++ b/springboot/starters/pom.xml -@@ -44,12 +44,12 @@ +@@ -64,12 +64,12 @@ kogito-api @@ -4754,10 +4795,10 @@ index 97d40cc694..657f222c75 100644 io.swagger.core.v3 diff --git a/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java b/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java -index 7b04631699..62fc719e1b 100644 +index 532c5c34be..a946de2658 100644 --- a/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java +++ b/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java -@@ -26,8 +26,7 @@ import java.util.concurrent.TimeUnit; +@@ -29,8 +29,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Consumer; diff --git a/.ci/environments/quarkus-3/patches/0002_javax.ws_to_jakarta.ws.patch b/.ci/environments/quarkus-3/patches/0002_javax.ws_to_jakarta.ws.patch index e8b8af04751..52aba1d51a5 100644 --- a/.ci/environments/quarkus-3/patches/0002_javax.ws_to_jakarta.ws.patch +++ b/.ci/environments/quarkus-3/patches/0002_javax.ws_to_jakarta.ws.patch @@ -34,8 +34,7 @@ diff --git a/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/ index 7f07766c1c..d983b515cf 100644 --- a/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionRestResourceQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionRestResourceQuarkusTemplate.java -@@ -17,14 +17,14 @@ package org.kie.dmn.kogito.quarkus.example; - +@@ -23,14 +23,14 @@ package org.kie.dmn.kogito.quarkus.example; import java.util.stream.Collectors; -import javax.ws.rs.Consumes; @@ -54,7 +53,8 @@ index 7f07766c1c..d983b515cf 100644 +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; - + + import org.kie.dmn.feel.codegen.feel11.CodegenStringUtil; import org.kie.kogito.Application; import org.kie.kogito.dmn.rest.DMNEvaluationErrorException; @@ -82,7 +82,7 @@ public class DMNRestResourceTemplate { @@ -214,7 +214,7 @@ diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/ index c9611d5a32..bf7aff2b2e 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/openapi/SimpleResource.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/openapi/SimpleResource.java -@@ -1,8 +1,8 @@ +@@ -19,8 +19,8 @@ import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; @@ -227,48 +227,6 @@ index c9611d5a32..bf7aff2b2e 100644 import org.eclipse.microprofile.openapi.annotations.tags.Tag; -diff --git a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryJavaTemplate.java b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryJavaTemplate.java -index 39b86127ef..10cfcda88f 100644 ---- a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryJavaTemplate.java -+++ b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryJavaTemplate.java -@@ -18,11 +18,11 @@ package com.myspace.demo; - import java.util.List; - import java.util.Map; - --import javax.ws.rs.Consumes; --import javax.ws.rs.POST; --import javax.ws.rs.Path; --import javax.ws.rs.Produces; --import javax.ws.rs.core.MediaType; -+import jakarta.ws.rs.Consumes; -+import jakarta.ws.rs.POST; -+import jakarta.ws.rs.Path; -+import jakarta.ws.rs.Produces; -+import jakarta.ws.rs.core.MediaType; - - import org.drools.ruleunits.api.RuleUnit; - import org.drools.ruleunits.api.RuleUnitInstance; -diff --git a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryQuarkusTemplate.java -index 3447ad6f97..4bfc800f1a 100644 ---- a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryQuarkusTemplate.java -+++ b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryQuarkusTemplate.java -@@ -18,11 +18,11 @@ package com.myspace.demo; - import java.util.List; - import java.util.Map; - --import javax.ws.rs.Consumes; --import javax.ws.rs.POST; --import javax.ws.rs.Path; --import javax.ws.rs.Produces; --import javax.ws.rs.core.MediaType; -+import jakarta.ws.rs.Consumes; -+import jakarta.ws.rs.POST; -+import jakarta.ws.rs.Path; -+import jakarta.ws.rs.Produces; -+import jakarta.ws.rs.core.MediaType; - - import org.drools.ruleunits.api.RuleUnit; - import org.drools.ruleunits.api.RuleUnitInstance; diff --git a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceQuarkusTemplate.java index 7fdbefde91..8920575b8a 100644 --- a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceQuarkusTemplate.java diff --git a/.ci/environments/quarkus-3/patches/0003_javax.inject_to_jakarta.inject.patch b/.ci/environments/quarkus-3/patches/0003_javax.inject_to_jakarta.inject.patch index 810fc5b0895..7606b2be785 100644 --- a/.ci/environments/quarkus-3/patches/0003_javax.inject_to_jakarta.inject.patch +++ b/.ci/environments/quarkus-3/patches/0003_javax.inject_to_jakarta.inject.patch @@ -36,37 +36,6 @@ index c15aa39596..bd1e412b4f 100644 protected QuarkusKogitoBuildContext(QuarkusKogitoBuildContextBuilder builder) { super(builder, new CDIDependencyInjectionAnnotator(), new CDIRestAnnotator(), CONTEXT_NAME); -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 ec8ccb9839..54cef037a5 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 -@@ -44,7 +44,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot - - @Override - public > T withNamed(T node, String name) { -- node.addAnnotation(new SingleMemberAnnotationExpr(new Name("javax.inject.Named"), new StringLiteralExpr(name))); -+ node.addAnnotation(new SingleMemberAnnotationExpr(new Name("jakarta.inject.Named"), new StringLiteralExpr(name))); - return node; - } - -@@ -61,7 +61,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot - - @Override - public > T withSingletonComponent(T node) { -- node.addAnnotation("javax.inject.Singleton"); -+ node.addAnnotation("jakarta.inject.Singleton"); - return node; - } - -@@ -72,7 +72,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot - - @Override - public > T withInjection(T node, boolean lazy) { -- node.addAnnotation("javax.inject.Inject"); -+ node.addAnnotation("jakarta.inject.Inject"); - 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 c1b9d1cdc1..64bd6d374c 100644 --- a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/ApplicationQuarkusTemplate.java @@ -296,32 +265,6 @@ index 2606d530d8..2897c9829e 100644 import org.kie.kogito.eventdriven.rules.AbstractEventDrivenQueryExecutor; import org.drools.ruleunits.api.RuleUnit; -diff --git a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/KogitoObjectMapperQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/KogitoObjectMapperQuarkusTemplate.java -index 606b30f790..fe0f357f40 100644 ---- a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/KogitoObjectMapperQuarkusTemplate.java -+++ b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/KogitoObjectMapperQuarkusTemplate.java -@@ -21,7 +21,7 @@ import java.io.IOException; - import java.util.List; - - import com.fasterxml.jackson.databind.JavaType; --import javax.inject.Singleton; -+import jakarta.inject.Singleton; - - import com.fasterxml.jackson.core.JsonParser; - import com.fasterxml.jackson.databind.ObjectMapper; -diff --git a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryQuarkusTemplate.java -index 4bfc800f1a..56ce0d01d1 100644 ---- a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryQuarkusTemplate.java -+++ b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryQuarkusTemplate.java -@@ -32,7 +32,7 @@ import static java.util.stream.Collectors.toList; - @Path("/$endpointName$") - public class $unit$Query$name$Endpoint { - -- @javax.inject.Inject -+ @jakarta.inject.Inject - RuleUnit<$UnitType$> ruleUnit; - - public $unit$Query$name$Endpoint() { } diff --git a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RuleUnitContainerQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RuleUnitContainerQuarkusTemplate.java index 829d4c5ada..aa8fa8a753 100644 --- a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RuleUnitContainerQuarkusTemplate.java 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 index 6a10e679769..0cd980d35b6 100644 --- 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 @@ -20,55 +20,6 @@ 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 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 - - @Override - public > T withProduces(T node, boolean isDefault) { -- node.addAndGetAnnotation("javax.enterprise.inject.Produces"); -+ node.addAndGetAnnotation("jakarta.enterprise.inject.Produces"); - if (isDefault) { - node.addAndGetAnnotation("io.quarkus.arc.DefaultBean"); - } -@@ -50,7 +50,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot - - @Override - public > T withApplicationComponent(T node) { -- node.addAnnotation("javax.enterprise.context.ApplicationScoped"); -+ node.addAnnotation("jakarta.enterprise.context.ApplicationScoped"); - return node; - } - -@@ -106,7 +106,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot - - @Override - public String optionalInstanceInjectionType() { -- return "javax.enterprise.inject.Instance"; -+ return "jakarta.enterprise.inject.Instance"; - } - - @Override -@@ -133,7 +133,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot - - @Override - public String applicationComponentType() { -- return "javax.enterprise.context.ApplicationScoped"; -+ return "jakarta.enterprise.context.ApplicationScoped"; - } - - @Override -@@ -173,7 +173,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot - - @Override - public > T withFactoryMethod(T node) { -- node.addAnnotation("javax.enterprise.inject.Produces"); -+ 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 @@ -212,7 +163,7 @@ diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/ index bf7aff2b2e..5baf698463 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/openapi/SimpleResource.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/openapi/SimpleResource.java -@@ -1,4 +1,4 @@ +@@ -19,4 +19,4 @@ -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import jakarta.ws.rs.GET; diff --git a/.ci/environments/quarkus-3/patches/0005_javax.annotation_to_jakarta.annotation.patch b/.ci/environments/quarkus-3/patches/0005_javax.annotation_to_jakarta.annotation.patch index 330d262015d..ecf893d0347 100644 --- a/.ci/environments/quarkus-3/patches/0005_javax.annotation_to_jakarta.annotation.patch +++ b/.ci/environments/quarkus-3/patches/0005_javax.annotation_to_jakarta.annotation.patch @@ -17,19 +17,6 @@ index a8ad497c5d..909d7a2b31 100644 public void init() { this.activate(); } -diff --git a/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/DependencyInjectionAnnotator.java b/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/DependencyInjectionAnnotator.java -index 29ebcf1a4d..fa2fcbce68 100644 ---- a/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/DependencyInjectionAnnotator.java -+++ b/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/DependencyInjectionAnnotator.java -@@ -179,7 +179,7 @@ public interface DependencyInjectionAnnotator { - rolesExpr.add(new StringLiteralExpr(role.trim())); - } - -- node.addAnnotation(new SingleMemberAnnotationExpr(new Name("javax.annotation.security.RolesAllowed"), new ArrayInitializerExpr(NodeList.nodeList(rolesExpr)))); -+ node.addAnnotation(new SingleMemberAnnotationExpr(new Name("jakarta.annotation.security.RolesAllowed"), new ArrayInitializerExpr(NodeList.nodeList(rolesExpr)))); - } - return node; - } diff --git a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ConfigBeanSpringTemplate.java b/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ConfigBeanSpringTemplate.java index b4593ab904..94041b4d11 100644 --- a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ConfigBeanSpringTemplate.java diff --git a/.ci/environments/quarkus-3/patches/0015_javax.inject_to_jakarta.inject-api.deps.patch b/.ci/environments/quarkus-3/patches/0015_javax.inject_to_jakarta.inject-api.deps.patch index 555fb031483..ea7f72dee45 100644 --- a/.ci/environments/quarkus-3/patches/0015_javax.inject_to_jakarta.inject-api.deps.patch +++ b/.ci/environments/quarkus-3/patches/0015_javax.inject_to_jakarta.inject-api.deps.patch @@ -2,15 +2,15 @@ diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito- index 244c1c4a8f..a244f76be0 100644 --- a/kogito-build/kogito-dependencies-bom/pom.xml +++ b/kogito-build/kogito-dependencies-bom/pom.xml -@@ -45,7 +45,7 @@ - 2.0.0 +@@ -48,7 +48,7 @@ + 2.0.1 1.3.2 1.3.2 - 1 + 2.0.1 2.0.1.Final 2.3.1 - 3.1 + 3.1.1 @@ -545,8 +545,8 @@ 3.0.2 diff --git a/.ci/environments/quarkus-3/patches/0016_update_dependencies_version.patch b/.ci/environments/quarkus-3/patches/0016_update_dependencies_version.patch index 58588eaeced..24d68aa01fb 100644 --- a/.ci/environments/quarkus-3/patches/0016_update_dependencies_version.patch +++ b/.ci/environments/quarkus-3/patches/0016_update_dependencies_version.patch @@ -10,18 +10,18 @@ index 37608a0de9..b7087b7e44 100644 + 21.5.0.0 2.3.0.1 2.3.5 - 2.0.0 + 2.0.1 @@ -57,8 +57,8 @@ 2.3.0 - 6.5.1 - 1.10.5 + 6.7.2 + 1.11.1 - 9.8.3 - 42.5.1 + 9.16.3 + 42.6.0 - 4.0.4.Final + 4.0.5.Final - 3.3.2 + 3.4.0 @@ -87,7 +87,7 @@ 21.0.1 @@ -31,23 +31,23 @@ index 37608a0de9..b7087b7e44 100644 4.4.14 1.7.13 2.0.4 -@@ -96,7 +96,7 @@ +@@ -97,7 +97,7 @@ 3.22.0 2.9.0 1.3 - 8.2 + 9.2 5.${version.org.junit.minor} - 5.9.2 - 5.9.2 -@@ -112,13 +112,13 @@ + 5.9.3 + 5.9.3 +@@ -113,13 +113,13 @@ 2.5.0.Final 1.0.4 0.10.2 - 1.7.36 + 2.0.6 - 3.9.1 + 3.9.3 3.7.1 3.2.0 diff --git a/.ci/environments/quarkus-3/quarkus3.yml b/.ci/environments/quarkus-3/quarkus3.yml index 587fcf4dbe0..e6ce9ca4ab8 100644 --- a/.ci/environments/quarkus-3/quarkus3.yml +++ b/.ci/environments/quarkus-3/quarkus3.yml @@ -3,7 +3,7 @@ description: Update Quarkus version and refactor imports and resources if needed type: specs.openrewrite.org/v1beta/recipe recipeList: - org.openrewrite.maven.ChangePropertyValue: { - newValue: 3.0.0.Final, + newValue: 3.2.9.Final, key: version.io.quarkus } - org.openrewrite.maven.ChangePropertyValue: { diff --git a/.github/workflows/pr-downstream.yml b/.github/workflows/pr-downstream.yml index 062a2cef900..8a477879ca1 100644 --- a/.github/workflows/pr-downstream.yml +++ b/.github/workflows/pr-downstream.yml @@ -22,8 +22,8 @@ jobs: matrix: job_name: [ kogito-apps, kogito-quarkus-examples, kogito-springboot-examples, serverless-workflow-examples ] os: [ubuntu-latest] - java-version: [11] - maven-version: ['3.8.7'] + java-version: [17] + maven-version: ['3.9.3'] include: - job_name: kogito-apps repository: kogito-apps diff --git a/.github/workflows/pr-kogito-runtimes.yml b/.github/workflows/pr-kogito-runtimes.yml index fc95b96b3eb..fb794f5f40a 100644 --- a/.github/workflows/pr-kogito-runtimes.yml +++ b/.github/workflows/pr-kogito-runtimes.yml @@ -21,8 +21,8 @@ jobs: strategy: matrix: os: [ubuntu-latest] - java-version: [11] - maven-version: ['3.8.7'] + java-version: [17] + maven-version: ['3.9.3'] fail-fast: false runs-on: ${{ matrix.os }} name: ${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }} diff --git a/README.md b/README.md index 74ac93ca1ef..a39979cd213 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ The official guides for Kogito can be found at our main website, these include g If you want to read more about Quarkus: - [Quarkus - Getting Started](https://quarkus.io/get-started/) - Quarkus Getting Started guide -- [Quarkus - Using Kogito to add business automation capabilities to an application](https://quarkus.io/version/2.13/guides/kogito) - A simple quick start hosted on the Quarkus web site. +- [Quarkus - Using Kogito to add business automation capabilities to an application](https://quarkus.io/guides/kogito) - A simple quick start hosted on the Quarkus web site. ## Building and Contributing to Kogito All contributions are welcome! Before you start please read the [contribution guide](CONTRIBUTING.md). diff --git a/addons/common/events/decisions/pom.xml b/addons/common/events/decisions/pom.xml index 8ae05e32003..b93610898ee 100644 --- a/addons/common/events/decisions/pom.xml +++ b/addons/common/events/decisions/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-events-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-events-decisions diff --git a/addons/common/events/mongodb/pom.xml b/addons/common/events/mongodb/pom.xml index d8abc5b8407..78575ca6e95 100644 --- a/addons/common/events/mongodb/pom.xml +++ b/addons/common/events/mongodb/pom.xml @@ -27,7 +27,7 @@ org.kie.kogito kogito-addons-events-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-events-mongodb diff --git a/addons/common/events/pom.xml b/addons/common/events/pom.xml index e1f2a9447fd..dd18af95791 100644 --- a/addons/common/events/pom.xml +++ b/addons/common/events/pom.xml @@ -23,7 +23,7 @@ org.kie.kogito kogito-addons-common-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-events-parent pom diff --git a/addons/common/events/predictions/pom.xml b/addons/common/events/predictions/pom.xml index 7a7ef9113a7..5f96952b426 100644 --- a/addons/common/events/predictions/pom.xml +++ b/addons/common/events/predictions/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-events-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-events-predictions diff --git a/addons/common/events/rules/pom.xml b/addons/common/events/rules/pom.xml index 079cc552f61..378ce7edf94 100644 --- a/addons/common/events/rules/pom.xml +++ b/addons/common/events/rules/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-events-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-events-rules diff --git a/addons/common/explainability/pom.xml b/addons/common/explainability/pom.xml index f5195c22a80..2ab6a38d95e 100644 --- a/addons/common/explainability/pom.xml +++ b/addons/common/explainability/pom.xml @@ -25,7 +25,7 @@ kogito-addons-common-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/addons/common/human-task-prediction/api/pom.xml b/addons/common/human-task-prediction/api/pom.xml index 54c11e10c3e..2f9e1676d96 100644 --- a/addons/common/human-task-prediction/api/pom.xml +++ b/addons/common/human-task-prediction/api/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-human-task-prediction-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-human-task-prediction-api Kogito :: Add-Ons :: Predictions :: API diff --git a/addons/common/human-task-prediction/pom.xml b/addons/common/human-task-prediction/pom.xml index bb027bbe3c1..8c2f0ac826d 100644 --- a/addons/common/human-task-prediction/pom.xml +++ b/addons/common/human-task-prediction/pom.xml @@ -23,7 +23,7 @@ org.kie.kogito kogito-addons-common-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-human-task-prediction-parent pom diff --git a/addons/common/human-task-prediction/smile/pom.xml b/addons/common/human-task-prediction/smile/pom.xml index 93fcf246006..a3e2c252523 100644 --- a/addons/common/human-task-prediction/smile/pom.xml +++ b/addons/common/human-task-prediction/smile/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-human-task-prediction-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-human-task-prediction-smile Kogito :: Add-Ons :: Predictions :: SMILE diff --git a/addons/common/jobs/api/pom.xml b/addons/common/jobs/api/pom.xml index d2d8c554f9a..6b494b89d6b 100644 --- a/addons/common/jobs/api/pom.xml +++ b/addons/common/jobs/api/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-jobs-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-jobs-api Kogito :: Add-Ons :: Jobs :: API @@ -75,7 +75,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java b/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java index 982afe1739e..ba5cfd6ac02 100644 --- a/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java +++ b/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java @@ -20,9 +20,6 @@ import java.time.temporal.ChronoUnit; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; - import org.kie.kogito.jobs.ProcessInstanceJobDescription; import org.kie.kogito.jobs.service.api.TemporalUnit; import org.kie.kogito.jobs.service.api.recipient.http.HttpRecipient; @@ -32,6 +29,9 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; + /** * Common definitions for add-ons implementations based on the Jobs Service to Runtime rest callback pattern. */ @@ -99,7 +99,7 @@ private static JsonNode buildPayload(ProcessInstanceJobDescription description, return objectMapper.valueToTree(new JobCallbackPayload(description.id())); } - private static TimerSchedule buildSchedule(ProcessInstanceJobDescription description) { + public static TimerSchedule buildSchedule(ProcessInstanceJobDescription description) { return TimerSchedule.builder() .startTime(description.expirationTime().get().toOffsetDateTime().truncatedTo(ChronoUnit.MILLIS)) .repeatCount(translateLimit(description.expirationTime().repeatLimit())) @@ -120,4 +120,4 @@ private static int translateLimit(int repeatLimit) { } return repeatLimit; } -} \ No newline at end of file +} diff --git a/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java b/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java index b1ca3a73db2..ee9b7aec67e 100644 --- a/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java +++ b/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java @@ -20,9 +20,6 @@ import java.net.URI; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; - import org.junit.jupiter.api.Test; import org.kie.kogito.jobs.ExactExpirationTime; import org.kie.kogito.jobs.ExpirationTime; @@ -33,6 +30,9 @@ import com.fasterxml.jackson.databind.JsonNode; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; + import static org.assertj.core.api.Assertions.assertThat; class JobCallbackResourceDefTest { diff --git a/addons/common/jobs/management-common/pom.xml b/addons/common/jobs/management-common/pom.xml index 20cf24e33f7..67fa382f196 100644 --- a/addons/common/jobs/management-common/pom.xml +++ b/addons/common/jobs/management-common/pom.xml @@ -25,7 +25,7 @@ kogito-addons-jobs-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/addons/common/jobs/pom.xml b/addons/common/jobs/pom.xml index 44464bf8e7a..01e6d6054b8 100644 --- a/addons/common/jobs/pom.xml +++ b/addons/common/jobs/pom.xml @@ -23,7 +23,7 @@ org.kie.kogito kogito-addons-common-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-jobs-parent pom diff --git a/addons/common/knative/eventing/pom.xml b/addons/common/knative/eventing/pom.xml index 403808218c5..e3df53214c8 100644 --- a/addons/common/knative/eventing/pom.xml +++ b/addons/common/knative/eventing/pom.xml @@ -25,7 +25,7 @@ kogito-addons-knative-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/addons/common/knative/pom.xml b/addons/common/knative/pom.xml index 799994c569a..93168640e61 100644 --- a/addons/common/knative/pom.xml +++ b/addons/common/knative/pom.xml @@ -25,7 +25,7 @@ kogito-addons-common-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/addons/common/kubernetes-service-catalog/pom.xml b/addons/common/kubernetes-service-catalog/pom.xml index 8633eac046b..90360b83270 100644 --- a/addons/common/kubernetes-service-catalog/pom.xml +++ b/addons/common/kubernetes-service-catalog/pom.xml @@ -25,7 +25,7 @@ kogito-addons-common-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/addons/common/kubernetes/pom.xml b/addons/common/kubernetes/pom.xml index 9a77b08b0d7..0e1d0a0bee6 100644 --- a/addons/common/kubernetes/pom.xml +++ b/addons/common/kubernetes/pom.xml @@ -25,7 +25,7 @@ kogito-addons-common-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -52,11 +52,13 @@ io.fabric8 kubernetes-client + ${version.io.fabric8.kubernetes-client} provided io.fabric8 knative-client + ${version.io.fabric8.kubernetes-client} provided diff --git a/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java b/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java index 9729b0ccdd2..d91626eb84b 100644 --- a/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java +++ b/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java @@ -26,9 +26,6 @@ import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.core.MediaType; - import org.kie.api.runtime.process.WorkItem; import org.kie.kogito.addons.k8s.Endpoint; import org.kie.kogito.addons.k8s.EndpointDiscovery; @@ -37,6 +34,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.core.MediaType; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; diff --git a/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java b/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java index 688c4cf7a09..8c245ca5d44 100644 --- a/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java +++ b/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java @@ -20,12 +20,12 @@ import java.util.Map; -import javax.ws.rs.HttpMethod; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.kie.kogito.process.workitems.impl.KogitoWorkItemImpl; +import jakarta.ws.rs.HttpMethod; + import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(TargetEndpointsMockServerExtension.class) diff --git a/addons/common/mail/pom.xml b/addons/common/mail/pom.xml index e2ca367171b..0137e672828 100644 --- a/addons/common/mail/pom.xml +++ b/addons/common/mail/pom.xml @@ -25,7 +25,7 @@ kogito-addons-common-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/addons/common/marshallers/avro/pom.xml b/addons/common/marshallers/avro/pom.xml index c4c1bb6d796..1653811a7b6 100644 --- a/addons/common/marshallers/avro/pom.xml +++ b/addons/common/marshallers/avro/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-marshallers-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-marshallers-avro diff --git a/addons/common/marshallers/pom.xml b/addons/common/marshallers/pom.xml index 6943eb2cdda..fbad35ed8e8 100644 --- a/addons/common/marshallers/pom.xml +++ b/addons/common/marshallers/pom.xml @@ -23,7 +23,7 @@ org.kie.kogito kogito-addons-common-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-marshallers-parent pom diff --git a/addons/common/messaging/pom.xml b/addons/common/messaging/pom.xml index 8ee82ee6643..bdd88c34b74 100644 --- a/addons/common/messaging/pom.xml +++ b/addons/common/messaging/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-common-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-messaging diff --git a/addons/common/monitoring/core/pom.xml b/addons/common/monitoring/core/pom.xml index 52d838dd905..4fbe326318a 100644 --- a/addons/common/monitoring/core/pom.xml +++ b/addons/common/monitoring/core/pom.xml @@ -25,7 +25,7 @@ kogito-addons-monitoring-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 Kogito :: Add-Ons :: Monitoring Core diff --git a/addons/common/monitoring/elastic/pom.xml b/addons/common/monitoring/elastic/pom.xml index 38e642797e0..948dd1595fb 100644 --- a/addons/common/monitoring/elastic/pom.xml +++ b/addons/common/monitoring/elastic/pom.xml @@ -25,7 +25,7 @@ kogito-addons-monitoring-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/addons/common/monitoring/pom.xml b/addons/common/monitoring/pom.xml index be70d977529..206067d79a5 100644 --- a/addons/common/monitoring/pom.xml +++ b/addons/common/monitoring/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-common-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-monitoring-parent Kogito :: Add-Ons :: Monitoring diff --git a/addons/common/monitoring/prometheus/pom.xml b/addons/common/monitoring/prometheus/pom.xml index bddf95a5bab..3629fbd524f 100644 --- a/addons/common/monitoring/prometheus/pom.xml +++ b/addons/common/monitoring/prometheus/pom.xml @@ -25,7 +25,7 @@ kogito-addons-monitoring-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/addons/common/persistence/ddl/pom.xml b/addons/common/persistence/ddl/pom.xml index bd32bcc829a..347509844f5 100644 --- a/addons/common/persistence/ddl/pom.xml +++ b/addons/common/persistence/ddl/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-persistence-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/addons/common/persistence/filesystem/pom.xml b/addons/common/persistence/filesystem/pom.xml index 7ecd62c86ce..4fd4853f7f2 100644 --- a/addons/common/persistence/filesystem/pom.xml +++ b/addons/common/persistence/filesystem/pom.xml @@ -23,7 +23,7 @@ org.kie.kogito kogito-addons-persistence-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-persistence-filesystem Kogito :: Add-Ons :: Persistence :: File System @@ -115,7 +115,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/addons/common/persistence/infinispan/pom.xml b/addons/common/persistence/infinispan/pom.xml index b30b289b844..abd601a237f 100644 --- a/addons/common/persistence/infinispan/pom.xml +++ b/addons/common/persistence/infinispan/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-persistence-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-persistence-infinispan Kogito :: Add-Ons :: Persistence :: Infinispan @@ -49,9 +49,9 @@ process-serialization-protobuf - + org.infinispan - infinispan-client-hotrod + infinispan-client-hotrod-jakarta @@ -127,7 +127,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/addons/common/persistence/jdbc/pom.xml b/addons/common/persistence/jdbc/pom.xml index 10961267018..8c3d0ecf1ec 100644 --- a/addons/common/persistence/jdbc/pom.xml +++ b/addons/common/persistence/jdbc/pom.xml @@ -23,7 +23,7 @@ org.kie.kogito kogito-addons-persistence-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-persistence-jdbc Kogito :: Add-Ons :: Persistence :: JDBC @@ -95,7 +95,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/addons/common/persistence/mongodb/pom.xml b/addons/common/persistence/mongodb/pom.xml index a4fcb6520a1..d92d76190e3 100644 --- a/addons/common/persistence/mongodb/pom.xml +++ b/addons/common/persistence/mongodb/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-persistence-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -113,7 +113,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/addons/common/persistence/pom.xml b/addons/common/persistence/pom.xml index d8979ea3aba..201b5c73ce0 100644 --- a/addons/common/persistence/pom.xml +++ b/addons/common/persistence/pom.xml @@ -24,7 +24,7 @@ org.kie.kogito kogito-addons-common-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-persistence-parent pom diff --git a/addons/common/persistence/postgresql/pom.xml b/addons/common/persistence/postgresql/pom.xml index 103238a98fb..1b8a5116c13 100644 --- a/addons/common/persistence/postgresql/pom.xml +++ b/addons/common/persistence/postgresql/pom.xml @@ -23,7 +23,7 @@ org.kie.kogito kogito-addons-persistence-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-persistence-postgresql Kogito :: Add-Ons :: Persistence :: PostgreSQL @@ -110,7 +110,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/addons/common/persistence/rocksdb/pom.xml b/addons/common/persistence/rocksdb/pom.xml index 0c1f6b8ed05..8d2af949562 100644 --- a/addons/common/persistence/rocksdb/pom.xml +++ b/addons/common/persistence/rocksdb/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-persistence-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-persistence-rocksdb Kogito :: Add-Ons :: Persistence :: RocksDB diff --git a/addons/common/pom.xml b/addons/common/pom.xml index 391f61dae13..cd05d51aab7 100644 --- a/addons/common/pom.xml +++ b/addons/common/pom.xml @@ -25,7 +25,7 @@ kogito-addons org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/addons/common/process-management/pom.xml b/addons/common/process-management/pom.xml index 10e8f3d7a81..33ab02165e7 100644 --- a/addons/common/process-management/pom.xml +++ b/addons/common/process-management/pom.xml @@ -25,7 +25,7 @@ kogito-addons-common-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/addons/common/process-svg/pom.xml b/addons/common/process-svg/pom.xml index 6767c7c5fa4..bf6146c13ae 100644 --- a/addons/common/process-svg/pom.xml +++ b/addons/common/process-svg/pom.xml @@ -25,7 +25,7 @@ kogito-addons-common-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/addons/common/rest-exception-handler/pom.xml b/addons/common/rest-exception-handler/pom.xml index 55736a3c660..267fc3a0abb 100644 --- a/addons/common/rest-exception-handler/pom.xml +++ b/addons/common/rest-exception-handler/pom.xml @@ -25,7 +25,7 @@ kogito-addons-common-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/addons/common/source-files/pom.xml b/addons/common/source-files/pom.xml index 2deb3741fe0..d448c5e7fe1 100644 --- a/addons/common/source-files/pom.xml +++ b/addons/common/source-files/pom.xml @@ -25,7 +25,7 @@ kogito-addons-common-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/addons/common/task-management/pom.xml b/addons/common/task-management/pom.xml index 3b3cbfab7dd..4663879c487 100644 --- a/addons/common/task-management/pom.xml +++ b/addons/common/task-management/pom.xml @@ -25,7 +25,7 @@ kogito-addons-common-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/addons/common/tracing/decision-common/pom.xml b/addons/common/tracing/decision-common/pom.xml index d9e80df4c87..03ad192937f 100644 --- a/addons/common/tracing/decision-common/pom.xml +++ b/addons/common/tracing/decision-common/pom.xml @@ -25,7 +25,7 @@ kogito-addons-tracing-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/addons/common/tracing/pom.xml b/addons/common/tracing/pom.xml index 3f7dc64a0ca..55c3c725b6b 100644 --- a/addons/common/tracing/pom.xml +++ b/addons/common/tracing/pom.xml @@ -25,7 +25,7 @@ kogito-addons-common-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/addons/common/tracing/tracing-api/pom.xml b/addons/common/tracing/tracing-api/pom.xml index cf2612509ea..3dc15e555fd 100644 --- a/addons/common/tracing/tracing-api/pom.xml +++ b/addons/common/tracing/tracing-api/pom.xml @@ -25,7 +25,7 @@ kogito-addons-tracing-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -84,7 +84,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/addons/common/tracing/typedvalue-api/pom.xml b/addons/common/tracing/typedvalue-api/pom.xml index 19b6d68cc89..91dbf45197d 100644 --- a/addons/common/tracing/typedvalue-api/pom.xml +++ b/addons/common/tracing/typedvalue-api/pom.xml @@ -25,7 +25,7 @@ kogito-addons-tracing-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -62,7 +62,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/addons/pom.xml b/addons/pom.xml index f58244343ad..99ccea32b31 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-build-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../kogito-build/kogito-build-parent/pom.xml kogito-addons diff --git a/api/kogito-api-incubation-application/pom.xml b/api/kogito-api-incubation-application/pom.xml index 6a237a93f0a..64e4c7cfcd8 100644 --- a/api/kogito-api-incubation-application/pom.xml +++ b/api/kogito-api-incubation-application/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-api-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-api-incubation-application diff --git a/api/kogito-api-incubation-common-objectmapper/pom.xml b/api/kogito-api-incubation-common-objectmapper/pom.xml index e93828815c8..f4f34d1ad67 100644 --- a/api/kogito-api-incubation-common-objectmapper/pom.xml +++ b/api/kogito-api-incubation-common-objectmapper/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-api-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-api-incubation-common-objectmapper diff --git a/api/kogito-api-incubation-common/pom.xml b/api/kogito-api-incubation-common/pom.xml index 40839c48658..102f4971d8b 100644 --- a/api/kogito-api-incubation-common/pom.xml +++ b/api/kogito-api-incubation-common/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-api-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-api-incubation-common diff --git a/api/kogito-api-incubation-decisions-services/pom.xml b/api/kogito-api-incubation-decisions-services/pom.xml index 6e642edefb1..24ee39835e3 100644 --- a/api/kogito-api-incubation-decisions-services/pom.xml +++ b/api/kogito-api-incubation-decisions-services/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-api-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-api-incubation-decisions-services diff --git a/api/kogito-api-incubation-decisions/pom.xml b/api/kogito-api-incubation-decisions/pom.xml index c775b750c5d..160755beaac 100644 --- a/api/kogito-api-incubation-decisions/pom.xml +++ b/api/kogito-api-incubation-decisions/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-api-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-api-incubation-decisions diff --git a/api/kogito-api-incubation-predictions-services/pom.xml b/api/kogito-api-incubation-predictions-services/pom.xml index 4aa3af9844c..8c8f3109be3 100644 --- a/api/kogito-api-incubation-predictions-services/pom.xml +++ b/api/kogito-api-incubation-predictions-services/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-api-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-api-incubation-predictions-services diff --git a/api/kogito-api-incubation-predictions/pom.xml b/api/kogito-api-incubation-predictions/pom.xml index 92e2f275fb5..40ee2c1e965 100644 --- a/api/kogito-api-incubation-predictions/pom.xml +++ b/api/kogito-api-incubation-predictions/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-api-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-api-incubation-predictions diff --git a/api/kogito-api-incubation-processes-services/pom.xml b/api/kogito-api-incubation-processes-services/pom.xml index 3ea7c583914..a3539319f76 100644 --- a/api/kogito-api-incubation-processes-services/pom.xml +++ b/api/kogito-api-incubation-processes-services/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-api-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-api-incubation-processes-services diff --git a/api/kogito-api-incubation-processes/pom.xml b/api/kogito-api-incubation-processes/pom.xml index 925fc7d29bd..10b18751b81 100644 --- a/api/kogito-api-incubation-processes/pom.xml +++ b/api/kogito-api-incubation-processes/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-api-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-api-incubation-processes diff --git a/api/kogito-api-incubation-rules-services/pom.xml b/api/kogito-api-incubation-rules-services/pom.xml index fe87509d9fa..78018ba519a 100644 --- a/api/kogito-api-incubation-rules-services/pom.xml +++ b/api/kogito-api-incubation-rules-services/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-api-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-api-incubation-rules-services @@ -110,7 +110,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/api/kogito-api-incubation-rules/pom.xml b/api/kogito-api-incubation-rules/pom.xml index dbed5aea0ae..1c714688674 100644 --- a/api/kogito-api-incubation-rules/pom.xml +++ b/api/kogito-api-incubation-rules/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-api-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-api-incubation-rules @@ -94,7 +94,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/api/kogito-api/pom.xml b/api/kogito-api/pom.xml index 68bd620d558..cec9ac55aab 100755 --- a/api/kogito-api/pom.xml +++ b/api/kogito-api/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-api-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-api @@ -58,9 +58,10 @@ - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api provided + 4.0.1 @@ -109,7 +110,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/api/kogito-api/src/main/java/org/kie/kogito/internal/process/runtime/KogitoNodeInstance.java b/api/kogito-api/src/main/java/org/kie/kogito/internal/process/runtime/KogitoNodeInstance.java index f91e8b1957f..a1483dd85ef 100644 --- a/api/kogito-api/src/main/java/org/kie/kogito/internal/process/runtime/KogitoNodeInstance.java +++ b/api/kogito-api/src/main/java/org/kie/kogito/internal/process/runtime/KogitoNodeInstance.java @@ -18,7 +18,9 @@ */ package org.kie.kogito.internal.process.runtime; +import java.util.Collections; import java.util.Date; +import java.util.Map; import org.kie.api.runtime.process.NodeInstance; @@ -67,4 +69,10 @@ default boolean isCancelled() { * @return actual leave time */ Date getLeaveTime(); + + Date getSlaDueDate(); + + default Map getMetaData() { + return Collections.emptyMap(); + } } diff --git a/api/kogito-api/src/main/java/org/kie/kogito/internal/process/runtime/KogitoWorkflowProcessInstance.java b/api/kogito-api/src/main/java/org/kie/kogito/internal/process/runtime/KogitoWorkflowProcessInstance.java index 078a9908541..7023cb28904 100644 --- a/api/kogito-api/src/main/java/org/kie/kogito/internal/process/runtime/KogitoWorkflowProcessInstance.java +++ b/api/kogito-api/src/main/java/org/kie/kogito/internal/process/runtime/KogitoWorkflowProcessInstance.java @@ -50,6 +50,8 @@ public interface KogitoWorkflowProcessInstance extends WorkflowProcessInstance, */ String getNodeIdInError(); + String getNodeInstanceIdInError(); + /** * Returns error message associated with this process instance in case it is in an error * state. It will consists of @@ -88,4 +90,6 @@ public interface KogitoWorkflowProcessInstance extends WorkflowProcessInstance, */ Collection adHocFragments(); + Date getSlaDueDate(); + } diff --git a/api/kogito-events-api/pom.xml b/api/kogito-events-api/pom.xml index 090579fc198..c7a02161801 100644 --- a/api/kogito-events-api/pom.xml +++ b/api/kogito-events-api/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-api-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-events-api diff --git a/api/kogito-events-api/src/main/java/org/kie/kogito/event/process/ProcessInstanceNodeEventBody.java b/api/kogito-events-api/src/main/java/org/kie/kogito/event/process/ProcessInstanceNodeEventBody.java index 704f9be1ac4..ca6621c0b14 100644 --- a/api/kogito-events-api/src/main/java/org/kie/kogito/event/process/ProcessInstanceNodeEventBody.java +++ b/api/kogito-events-api/src/main/java/org/kie/kogito/event/process/ProcessInstanceNodeEventBody.java @@ -29,6 +29,14 @@ public class ProcessInstanceNodeEventBody { public static final int EVENT_TYPE_EXIT = 2; + public static final int EVENT_TYPE_ABORTED = 3; + + public static final int EVENT_TYPE_SKIPPED = 4; + + public static final int EVENT_TYPE_OBSOLETE = 5; + + public static final int EVENT_TYPE_ERROR = 6; + // common fields for events private Date eventDate; @@ -47,7 +55,7 @@ public class ProcessInstanceNodeEventBody { // custom data fields - private String connectionNodeInstanceId; // only for entering and leaving + private String connectionNodeDefinitionId; // only for entering and leaving private String nodeDefinitionId; // definition on bpmn2 @@ -57,6 +65,10 @@ public class ProcessInstanceNodeEventBody { private String nodeInstanceId; + private String workItemId; + + private Date slaDueDate; + private Map data; private ProcessInstanceNodeEventBody() { @@ -87,8 +99,8 @@ public String getProcessInstanceId() { return processInstanceId; } - public String getConnectionNodeInstanceId() { - return connectionNodeInstanceId; + public String getConnectionNodeDefinitionId() { + return connectionNodeDefinitionId; } public String getNodeDefinitionId() { @@ -107,6 +119,14 @@ public String getNodeInstanceId() { return nodeInstanceId; } + public Date getSlaDueDate() { + return slaDueDate; + } + + public String getWorkItemId() { + return workItemId; + } + public Map getData() { return data; } @@ -114,7 +134,7 @@ public Map getData() { @Override public String toString() { return "ProcessInstanceNodeEventBody [eventDate=" + eventDate + ", eventUser=" + eventUser + ", eventType=" + eventType + ", processId=" + processId + ", processVersion=" + processVersion - + ", processInstanceId=" + processInstanceId + ", connectionNodeInstanceId=" + connectionNodeInstanceId + ", nodeDefinitionId=" + nodeDefinitionId + ", nodeName=" + nodeName + + ", processInstanceId=" + processInstanceId + ", connectionNodeInstanceId=" + connectionNodeDefinitionId + ", nodeDefinitionId=" + nodeDefinitionId + ", nodeName=" + nodeName + ", nodeType=" + nodeType + ", nodeInstanceId=" + nodeInstanceId + ", data=" + data + "]"; } @@ -181,8 +201,8 @@ public Builder processInstanceId(String processInstanceId) { return this; } - public Builder connectionNodeInstanceId(String connectionNodeInstanceId) { - instance.connectionNodeInstanceId = connectionNodeInstanceId; + public Builder connectionNodeDefinitionId(String connectionNodeDefinitionId) { + instance.connectionNodeDefinitionId = connectionNodeDefinitionId; return this; } @@ -211,8 +231,20 @@ public Builder data(String name, Object value) { return this; } + public Builder slaDueDate(Date slaDueDate) { + instance.slaDueDate = slaDueDate; + return this; + } + + public Builder workItemId(String workItemId) { + instance.workItemId = workItemId; + return this; + } + public ProcessInstanceNodeEventBody build() { return instance; } + } + } diff --git a/api/kogito-events-api/src/main/java/org/kie/kogito/event/process/ProcessInstanceSLAEventBody.java b/api/kogito-events-api/src/main/java/org/kie/kogito/event/process/ProcessInstanceSLAEventBody.java index 91fc9f75ec8..133c0e57155 100644 --- a/api/kogito-events-api/src/main/java/org/kie/kogito/event/process/ProcessInstanceSLAEventBody.java +++ b/api/kogito-events-api/src/main/java/org/kie/kogito/event/process/ProcessInstanceSLAEventBody.java @@ -41,6 +41,20 @@ public class ProcessInstanceSLAEventBody { private String nodeInstanceId; + private String nodeName; + + private String nodeType; + + private Date slaDueDate; + + public Date getSlaDueDate() { + return slaDueDate; + } + + public void setSlaDueDate(Date slaDueDate) { + this.slaDueDate = slaDueDate; + } + public Date getEventDate() { return eventDate; } @@ -69,6 +83,14 @@ public String getNodeInstanceId() { return nodeInstanceId; } + public String getNodeName() { + return nodeName; + } + + public String getNodeType() { + return nodeType; + } + @Override public String toString() { return "ProcessErrorEventBody [processId=" + processId + ", processInstanceId=" + processInstanceId + ", nodeDefinitionId=" + nodeDefinitionId + ", nodeInstanceId=" + nodeInstanceId + "]"; @@ -86,6 +108,11 @@ private Builder(ProcessInstanceSLAEventBody instance) { this.instance = instance; } + public Builder slaDueDate(Date slaDueDate) { + this.instance.slaDueDate = slaDueDate; + return this; + } + public Builder eventDate(Date eventDate) { this.instance.eventDate = eventDate; return this; @@ -121,8 +148,19 @@ public Builder nodeDefinitionId(String nodeDefinitionId) { return this; } + public Builder nodeName(String nodeName) { + instance.nodeName = nodeName; + return this; + } + + public Builder nodeType(String nodeType) { + instance.nodeType = nodeType; + return this; + } + public ProcessInstanceSLAEventBody build() { return instance; } } + } diff --git a/api/kogito-events-api/src/main/java/org/kie/kogito/event/process/ProcessInstanceStateEventBody.java b/api/kogito-events-api/src/main/java/org/kie/kogito/event/process/ProcessInstanceStateEventBody.java index a6cc39229b9..6c7b7a80c3f 100644 --- a/api/kogito-events-api/src/main/java/org/kie/kogito/event/process/ProcessInstanceStateEventBody.java +++ b/api/kogito-events-api/src/main/java/org/kie/kogito/event/process/ProcessInstanceStateEventBody.java @@ -62,6 +62,8 @@ public class ProcessInstanceStateEventBody { private Set roles; + public Date slaDueDate; + public Date getEventDate() { return eventDate; } @@ -118,6 +120,10 @@ public Set getRoles() { return roles; } + public Date getSlaDueDate() { + return slaDueDate; + } + public Builder update() { return new Builder(this); } @@ -245,8 +251,14 @@ public Builder roles(String... roles) { return this; } + public Builder slaDueDate(Date slaDueDate) { + instance.slaDueDate = slaDueDate; + return this; + } + public ProcessInstanceStateEventBody build() { return instance; } + } } diff --git a/api/kogito-events-api/src/main/java/org/kie/kogito/event/usertask/UserTaskInstanceStateEventBody.java b/api/kogito-events-api/src/main/java/org/kie/kogito/event/usertask/UserTaskInstanceStateEventBody.java index 336f7fb4188..a8423c45355 100644 --- a/api/kogito-events-api/src/main/java/org/kie/kogito/event/usertask/UserTaskInstanceStateEventBody.java +++ b/api/kogito-events-api/src/main/java/org/kie/kogito/event/usertask/UserTaskInstanceStateEventBody.java @@ -35,9 +35,6 @@ public class UserTaskInstanceStateEventBody { private String userTaskInstanceId; private String userTaskName; - // custom data fields - private Integer eventType; // CREATED, ADDED, CLAIMED.... - private String userTaskDescription; private String userTaskPriority; private String userTaskReferenceName; @@ -48,6 +45,8 @@ public class UserTaskInstanceStateEventBody { private String processInstanceId; + private String eventType; + public Date getEventDate() { return eventDate; } @@ -68,10 +67,6 @@ public String getUserTaskName() { return userTaskName; } - public Integer getEventType() { - return eventType; - } - public String getUserTaskDescription() { return userTaskDescription; } @@ -96,6 +91,10 @@ public String getProcessInstanceId() { return processInstanceId; } + public String getEventType() { + return eventType; + } + public Map metaData() { Map metadata = new HashMap<>(); metadata.put(UserTaskInstanceEventMetadata.USER_TASK_INSTANCE_ID_META_DATA, userTaskInstanceId); @@ -107,7 +106,7 @@ public Map metaData() { @Override public String toString() { return "UserTaskInstanceStateEventBody [eventDate=" + eventDate + ", eventUser=" + eventUser + ", userTaskDefinitionId=" + userTaskDefinitionId + ", userTaskInstanceId=" + userTaskInstanceId - + ", userTaskName=" + userTaskName + ", eventType=" + eventType + ", userTaskDescription=" + userTaskDescription + ", userTaskPriority=" + userTaskPriority + ", userTaskReferenceName=" + + ", userTaskName=" + userTaskName + ", userTaskDescription=" + userTaskDescription + ", userTaskPriority=" + userTaskPriority + ", userTaskReferenceName=" + userTaskReferenceName + ", state=" + state + ", actualOwner=" + actualOwner + ", processInstanceId=" + processInstanceId + "]"; } @@ -170,11 +169,6 @@ public Builder userTaskName(String userTaskName) { return this; } - public Builder eventType(Integer eventType) { - this.instance.eventType = eventType; - return this; - } - public Builder userTaskDescription(String userTaskDescription) { this.instance.userTaskDescription = userTaskDescription; return this; @@ -200,6 +194,11 @@ public Builder actualOwner(String userId) { return this; } + public Builder eventType(String eventType) { + this.instance.eventType = eventType; + return this; + } + public Builder processInstanceId(String processInstanceId) { this.instance.processInstanceId = processInstanceId; return this; @@ -209,4 +208,5 @@ public UserTaskInstanceStateEventBody build() { return this.instance; } } + } diff --git a/api/kogito-events-core/pom.xml b/api/kogito-events-core/pom.xml index d47114e0d7f..52efc3cc388 100644 --- a/api/kogito-events-core/pom.xml +++ b/api/kogito-events-core/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-api-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-events-core diff --git a/api/kogito-events-core/src/main/java/org/kie/kogito/event/impl/ProcessInstanceEventBatch.java b/api/kogito-events-core/src/main/java/org/kie/kogito/event/impl/ProcessInstanceEventBatch.java index 3991c65da02..96a34dba476 100644 --- a/api/kogito-events-core/src/main/java/org/kie/kogito/event/impl/ProcessInstanceEventBatch.java +++ b/api/kogito-events-core/src/main/java/org/kie/kogito/event/impl/ProcessInstanceEventBatch.java @@ -18,11 +18,13 @@ */ package org.kie.kogito.event.impl; +import java.time.Instant; import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.HashMap; import java.util.Map; +import java.util.Objects; import org.kie.api.event.process.ProcessCompletedEvent; import org.kie.api.event.process.ProcessEvent; @@ -66,7 +68,11 @@ import org.kie.kogito.event.usertask.UserTaskInstanceStateEventBody; import org.kie.kogito.event.usertask.UserTaskInstanceVariableDataEvent; import org.kie.kogito.event.usertask.UserTaskInstanceVariableEventBody; +import org.kie.kogito.internal.process.event.KogitoProcessVariableChangedEvent; +import org.kie.kogito.internal.process.runtime.KogitoNodeInstance; import org.kie.kogito.internal.process.runtime.KogitoProcessInstance; +import org.kie.kogito.internal.process.runtime.KogitoWorkItem; +import org.kie.kogito.internal.process.runtime.KogitoWorkItemNodeInstance; import org.kie.kogito.internal.process.runtime.KogitoWorkflowProcessInstance; import org.kie.kogito.process.workitem.HumanTaskWorkItem; @@ -103,23 +109,20 @@ private void addDataEvent(ProcessEvent event) { } else if (event instanceof ProcessCompletedEvent) { handleProcessStateEvent((ProcessCompletedEvent) event); } else if (event instanceof ProcessNodeTriggeredEvent) { - handleProcesssNodeEvent((ProcessNodeTriggeredEvent) event); + handleProcessNodeEvent((ProcessNodeTriggeredEvent) event); } else if (event instanceof ProcessNodeLeftEvent) { - handleProcesssNodeEvent((ProcessNodeLeftEvent) event); + handleProcessNodeEvent((ProcessNodeLeftEvent) event); } else if (event instanceof SLAViolatedEvent) { handleProcesssNodeEvent((SLAViolatedEvent) event); } else if (event instanceof ProcessVariableChangedEvent) { - handleProcesssVariableEvent((ProcessVariableChangedEvent) event); + handleProcessVariableEvent((ProcessVariableChangedEvent) event); } } - private void handleProcesssVariableEvent(ProcessVariableChangedEvent event) { - // custom data fields for this event that are not there - // private String nodeContainerDefinitionId; - // private String nodeContainerInstanceId; + private void handleProcessVariableEvent(ProcessVariableChangedEvent event) { Map metadata = buildProcessMetadata((KogitoWorkflowProcessInstance) event.getProcessInstance()); - + KogitoWorkflowProcessInstance pi = (KogitoWorkflowProcessInstance) event.getProcessInstance(); ProcessInstanceVariableEventBody.Builder builder = ProcessInstanceVariableEventBody.create() .eventDate(new Date()) .eventUser(event.getEventIdentity()) @@ -130,41 +133,83 @@ private void handleProcesssVariableEvent(ProcessVariableChangedEvent event) { .variableName(event.getVariableId()) .variableValue(event.getNewValue()); + if (event instanceof KogitoProcessVariableChangedEvent) { + KogitoProcessVariableChangedEvent varEvent = (KogitoProcessVariableChangedEvent) event; + if (varEvent.getNodeInstance() != null && varEvent.getNodeInstance().getNodeInstanceContainer() != null) { + if (varEvent.getNodeInstance().getNodeInstanceContainer() instanceof KogitoNodeInstance) { + builder.nodeContainerDefinitionId(((KogitoNodeInstance) varEvent.getNodeInstance().getNodeInstanceContainer()).getNodeDefinitionId()); + builder.nodeContainerInstanceId(((KogitoNodeInstance) varEvent.getNodeInstance().getNodeInstanceContainer()).getId()); + } + } + } + ProcessInstanceVariableEventBody body = builder.build(); - processedEvents.add(new ProcessInstanceVariableDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventIdentity(), metadata, body)); + ProcessInstanceVariableDataEvent piEvent = + new ProcessInstanceVariableDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventIdentity(), metadata, body); + piEvent.setKogitoBusinessKey(pi.getBusinessKey()); + processedEvents.add(piEvent); } private void handleProcesssNodeEvent(SLAViolatedEvent event) { Map metadata = buildProcessMetadata((KogitoWorkflowProcessInstance) event.getProcessInstance()); + KogitoWorkflowProcessInstance pi = (KogitoWorkflowProcessInstance) event.getProcessInstance(); ProcessInstanceSLAEventBody.Builder builder = ProcessInstanceSLAEventBody.create() - .eventDate(new Date()) + .eventDate(Date.from(Instant.now())) .eventUser(event.getEventIdentity()) .processId(event.getProcessInstance().getProcessId()) .processVersion(event.getProcessInstance().getProcessVersion()) .processInstanceId(event.getProcessInstance().getId()); - if (event.getNodeInstance() != null) { - builder.nodeDefinitionId(event.getNodeInstance().getNode().getNodeUniqueId()) - .nodeInstanceId(event.getNodeInstance().getId()); + if (event.getNodeInstance() instanceof KogitoNodeInstance) { + KogitoNodeInstance ni = (KogitoNodeInstance) event.getNodeInstance(); + builder.nodeDefinitionId(ni.getNode().getNodeUniqueId()) + .nodeInstanceId(ni.getId()) + .nodeName(ni.getNodeName()) + .nodeType(ni.getNode().getClass().getSimpleName()) + .slaDueDate(ni.getSlaDueDate()); + } else { + builder.slaDueDate(pi.getSlaDueDate()); } ProcessInstanceSLAEventBody body = builder.build(); - processedEvents.add(new ProcessInstanceSLADataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventIdentity(), metadata, body)); + ProcessInstanceSLADataEvent piEvent = new ProcessInstanceSLADataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventIdentity(), metadata, body); + piEvent.setKogitoBusinessKey(pi.getBusinessKey()); + processedEvents.add(piEvent); } - private void handleProcesssNodeEvent(ProcessNodeLeftEvent event) { - processedEvents.add(toProcessInstanceNodeEvent(event, ProcessInstanceNodeEventBody.EVENT_TYPE_EXIT)); + private void handleProcessNodeEvent(ProcessNodeLeftEvent event) { + KogitoNodeInstance nodeInstance = (KogitoNodeInstance) event.getNodeInstance(); + int eventType = ProcessInstanceNodeEventBody.EVENT_TYPE_EXIT; + + if (nodeInstance.getCancelType() != null) { + switch (nodeInstance.getCancelType()) { + case ABORTED: + eventType = ProcessInstanceNodeEventBody.EVENT_TYPE_ABORTED; + break; + case SKIPPED: + eventType = ProcessInstanceNodeEventBody.EVENT_TYPE_SKIPPED; + break; + case OBSOLETE: + eventType = ProcessInstanceNodeEventBody.EVENT_TYPE_OBSOLETE; + break; + case ERROR: + eventType = ProcessInstanceNodeEventBody.EVENT_TYPE_ERROR; + } + } + + processedEvents.add(toProcessInstanceNodeEvent(event, eventType)); } - private void handleProcesssNodeEvent(ProcessNodeTriggeredEvent event) { + private void handleProcessNodeEvent(ProcessNodeTriggeredEvent event) { processedEvents.add(toProcessInstanceNodeEvent(event, ProcessInstanceNodeEventBody.EVENT_TYPE_ENTER)); } private ProcessInstanceNodeDataEvent toProcessInstanceNodeEvent(ProcessNodeEvent event, int eventType) { Map metadata = buildProcessMetadata((KogitoWorkflowProcessInstance) event.getProcessInstance()); - + KogitoWorkflowProcessInstance pi = (KogitoWorkflowProcessInstance) event.getProcessInstance(); + KogitoNodeInstance nodeInstance = (KogitoNodeInstance) event.getNodeInstance(); ProcessInstanceNodeEventBody.Builder builder = ProcessInstanceNodeEventBody.create() .eventDate(new Date()) .eventUser(event.getEventIdentity()) @@ -175,10 +220,26 @@ private ProcessInstanceNodeDataEvent toProcessInstanceNodeEvent(ProcessNodeEvent .nodeName(event.getNodeInstance().getNodeName()) .nodeType(event.getNodeInstance().getNode().getClass().getSimpleName()) .nodeInstanceId(event.getNodeInstance().getId()) - .nodeDefinitionId(event.getNodeInstance().getNode().getNodeUniqueId()); + .nodeDefinitionId(event.getNodeInstance().getNode().getNodeUniqueId()) + .slaDueDate(nodeInstance.getSlaDueDate()); + + if (eventType == ProcessInstanceNodeEventBody.EVENT_TYPE_ENTER) { + builder.connectionNodeDefinitionId((String) nodeInstance.getMetaData().get("IncomingConnection")); + } else { + builder.connectionNodeDefinitionId((String) nodeInstance.getMetaData().get("OutgoingConnection")); + } + + if (nodeInstance instanceof KogitoWorkItemNodeInstance) { + KogitoWorkItem workItem = ((KogitoWorkItemNodeInstance) nodeInstance).getWorkItem(); + if (workItem != null) { + builder.workItemId(workItem.getStringId()); + } + } ProcessInstanceNodeEventBody body = builder.build(); - return new ProcessInstanceNodeDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventIdentity(), metadata, body); + ProcessInstanceNodeDataEvent piEvent = new ProcessInstanceNodeDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventIdentity(), metadata, body); + piEvent.setKogitoBusinessKey(pi.getBusinessKey()); + return piEvent; } private void handleProcessStateEvent(ProcessCompletedEvent event) { @@ -194,10 +255,14 @@ private void handleProcessStateEvent(ProcessCompletedEvent event) { .processId(pi.getProcessId()) .processVersion(pi.getProcessVersion()) .nodeDefinitionId(pi.getNodeIdInError()) + .nodeInstanceId(pi.getNodeInstanceIdInError()) .errorMessage(pi.getErrorMessage()) .build(); Map metadata = buildProcessMetadata((KogitoWorkflowProcessInstance) event.getProcessInstance()); - processedEvents.add(new ProcessInstanceErrorDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventIdentity(), metadata, errorBody)); + ProcessInstanceErrorDataEvent piEvent = + new ProcessInstanceErrorDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventIdentity(), metadata, errorBody); + piEvent.setKogitoBusinessKey(pi.getBusinessKey()); + processedEvents.add(piEvent); } } @@ -213,10 +278,14 @@ private void handleProcessStateEvent(ProcessStartedEvent event) { .processId(pi.getProcessId()) .processVersion(pi.getProcessVersion()) .nodeDefinitionId(pi.getNodeIdInError()) + .nodeInstanceId(pi.getNodeInstanceIdInError()) .errorMessage(pi.getErrorMessage()) .build(); Map metadata = buildProcessMetadata((KogitoWorkflowProcessInstance) event.getProcessInstance()); - processedEvents.add(new ProcessInstanceErrorDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventIdentity(), metadata, errorBody)); + ProcessInstanceErrorDataEvent piEvent = + new ProcessInstanceErrorDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventIdentity(), metadata, errorBody); + piEvent.setKogitoBusinessKey(pi.getBusinessKey()); + processedEvents.add(piEvent); } } @@ -239,7 +308,8 @@ private ProcessInstanceStateDataEvent toProcessInstanceStateEvent(ProcessEvent e .parentInstanceId(pi.getParentProcessInstanceId()) .rootProcessId(pi.getRootProcessId()) .rootProcessInstanceId(pi.getRootProcessInstanceId()) - .state(event.getProcessInstance().getState()); + .state(event.getProcessInstance().getState()) + .slaDueDate(pi.getSlaDueDate()); String securityRoles = (String) event.getProcessInstance().getProcess().getMetaData().get("securityRoles"); if (securityRoles != null) { @@ -247,7 +317,9 @@ private ProcessInstanceStateDataEvent toProcessInstanceStateEvent(ProcessEvent e } ProcessInstanceStateEventBody body = builder.build(); - return new ProcessInstanceStateDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventIdentity(), metadata, body); + ProcessInstanceStateDataEvent piEvent = new ProcessInstanceStateDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventIdentity(), metadata, body); + piEvent.setKogitoBusinessKey(pi.getBusinessKey()); + return piEvent; } private Map buildProcessMetadata(KogitoWorkflowProcessInstance pi) { @@ -283,6 +355,7 @@ private void addDataEvent(UserTaskEvent event) { private void handleUserTaskCommentEvent(UserTaskCommentEvent event) { Map metadata = buildUserTaskMetadata((HumanTaskWorkItem) event.getWorkItem()); metadata.putAll(buildProcessMetadata((KogitoWorkflowProcessInstance) event.getProcessInstance())); + KogitoWorkflowProcessInstance pi = (KogitoWorkflowProcessInstance) event.getProcessInstance(); int eventType = UserTaskInstanceCommentEventBody.EVENT_TYPE_ADDED; if (event.getOldComment() != null && event.getNewComment() == null) { @@ -317,13 +390,16 @@ private void handleUserTaskCommentEvent(UserTaskCommentEvent event) { } UserTaskInstanceCommentEventBody body = builder.build(); - processedEvents.add(new UserTaskInstanceCommentDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), updatedBy, metadata, body)); + UserTaskInstanceCommentDataEvent utEvent = new UserTaskInstanceCommentDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), updatedBy, metadata, body); + utEvent.setKogitoBusinessKey(pi.getBusinessKey()); + processedEvents.add(utEvent); } private void handleUserTaskAttachmentEvent(UserTaskAttachmentEvent event) { Map metadata = buildUserTaskMetadata((HumanTaskWorkItem) event.getWorkItem()); metadata.putAll(buildProcessMetadata((KogitoWorkflowProcessInstance) event.getProcessInstance())); + KogitoWorkflowProcessInstance pi = (KogitoWorkflowProcessInstance) event.getProcessInstance(); int eventType = UserTaskInstanceAttachmentEventBody.EVENT_TYPE_ADDED; if (event.getOldAttachment() != null && event.getNewAttachment() == null) { @@ -359,15 +435,16 @@ private void handleUserTaskAttachmentEvent(UserTaskAttachmentEvent event) { } UserTaskInstanceAttachmentEventBody body = builder.build(); - processedEvents - .add(new UserTaskInstanceAttachmentDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), updatedBy, metadata, body)); + UserTaskInstanceAttachmentDataEvent utEvent = new UserTaskInstanceAttachmentDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), updatedBy, metadata, body); + utEvent.setKogitoBusinessKey(pi.getBusinessKey()); + processedEvents.add(utEvent); } private void handleUserTaskAssignmentEvent(UserTaskAssignmentEvent event) { Map metadata = buildUserTaskMetadata((HumanTaskWorkItem) event.getWorkItem()); metadata.putAll(buildProcessMetadata((KogitoWorkflowProcessInstance) event.getProcessInstance())); - + KogitoWorkflowProcessInstance pi = (KogitoWorkflowProcessInstance) event.getProcessInstance(); UserTaskInstanceAssignmentEventBody.Builder builder = UserTaskInstanceAssignmentEventBody.create() .eventDate(new Date()) .eventUser(event.getEventUser()) @@ -378,13 +455,16 @@ private void handleUserTaskAssignmentEvent(UserTaskAssignmentEvent event) { .users(event.getNewUsersId()); UserTaskInstanceAssignmentEventBody body = builder.build(); - processedEvents.add(new UserTaskInstanceAssignmentDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventUser(), metadata, body)); + UserTaskInstanceAssignmentDataEvent utEvent = + new UserTaskInstanceAssignmentDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventUser(), metadata, body); + utEvent.setKogitoBusinessKey(pi.getBusinessKey()); + processedEvents.add(utEvent); } private void handleUserTaskDeadlineEvent(UserTaskDeadlineEvent event) { Map metadata = buildUserTaskMetadata((HumanTaskWorkItem) event.getWorkItem()); metadata.putAll(buildProcessMetadata((KogitoWorkflowProcessInstance) event.getProcessInstance())); - + KogitoWorkflowProcessInstance pi = (KogitoWorkflowProcessInstance) event.getProcessInstance(); UserTaskInstanceDeadlineEventBody.Builder builder = UserTaskInstanceDeadlineEventBody.create() .eventDate(new Date()) .eventUser(event.getEventUser()) @@ -394,13 +474,19 @@ private void handleUserTaskDeadlineEvent(UserTaskDeadlineEvent event) { .notification(event.getNotification()); UserTaskInstanceDeadlineEventBody body = builder.build(); - processedEvents.add(new UserTaskInstanceDeadlineDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventUser(), metadata, body)); + UserTaskInstanceDeadlineDataEvent utEvent = + new UserTaskInstanceDeadlineDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventUser(), metadata, body); + utEvent.setKogitoBusinessKey(pi.getBusinessKey()); + processedEvents.add(utEvent); } private void handleUserTaskStateEvent(UserTaskStateEvent event) { + if (event.getNewStatus() == null) { + return; + } Map metadata = buildUserTaskMetadata((HumanTaskWorkItem) event.getWorkItem()); metadata.putAll(buildProcessMetadata((KogitoWorkflowProcessInstance) event.getProcessInstance())); - + KogitoWorkflowProcessInstance pi = (KogitoWorkflowProcessInstance) event.getProcessInstance(); UserTaskInstanceStateEventBody.Builder builder = UserTaskInstanceStateEventBody.create() .eventDate(new Date()) .eventUser(event.getEventUser()) @@ -410,18 +496,25 @@ private void handleUserTaskStateEvent(UserTaskStateEvent event) { .userTaskDescription(((HumanTaskWorkItem) event.getWorkItem()).getTaskDescription()) .userTaskPriority(((HumanTaskWorkItem) event.getWorkItem()).getTaskPriority()) .userTaskReferenceName(((HumanTaskWorkItem) event.getWorkItem()).getReferenceName()) - .state(((HumanTaskWorkItem) event.getWorkItem()).getPhaseStatus()) + .state(event.getNewStatus()) .actualOwner(((HumanTaskWorkItem) event.getWorkItem()).getActualOwner()) + .eventType(isTransition(event) ? event.getNewStatus() : "Modify") .processInstanceId(event.getProcessInstance().getId()); UserTaskInstanceStateEventBody body = builder.build(); - processedEvents.add(new UserTaskInstanceStateDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventUser(), metadata, body)); + UserTaskInstanceStateDataEvent utEvent = new UserTaskInstanceStateDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventUser(), metadata, body); + utEvent.setKogitoBusinessKey(pi.getBusinessKey()); + processedEvents.add(utEvent); + } + + private boolean isTransition(UserTaskStateEvent event) { + return !Objects.equals(event.getOldStatus(), event.getNewStatus()); } private void handleUserTaskVariableEvent(UserTaskVariableEvent event) { Map metadata = buildUserTaskMetadata((HumanTaskWorkItem) event.getWorkItem()); metadata.putAll(buildProcessMetadata((KogitoWorkflowProcessInstance) event.getProcessInstance())); - + KogitoWorkflowProcessInstance pi = (KogitoWorkflowProcessInstance) event.getProcessInstance(); UserTaskInstanceVariableEventBody.Builder builder = UserTaskInstanceVariableEventBody.create() .eventDate(new Date()) .eventUser(event.getEventUser()) @@ -434,8 +527,10 @@ private void handleUserTaskVariableEvent(UserTaskVariableEvent event) { .variableType(event.getVariableType().name()); UserTaskInstanceVariableEventBody body = builder.build(); - - processedEvents.add(new UserTaskInstanceVariableDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventUser(), metadata, body)); + UserTaskInstanceVariableDataEvent utEvent = + new UserTaskInstanceVariableDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventUser(), metadata, body); + utEvent.setKogitoBusinessKey(pi.getBusinessKey()); + processedEvents.add(utEvent); } diff --git a/api/kogito-events-core/src/main/java/org/kie/kogito/event/job/JobInstanceDataEvent.java b/api/kogito-events-core/src/main/java/org/kie/kogito/event/job/JobInstanceDataEvent.java new file mode 100644 index 00000000000..023bdc3d949 --- /dev/null +++ b/api/kogito-events-core/src/main/java/org/kie/kogito/event/job/JobInstanceDataEvent.java @@ -0,0 +1,37 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.kie.kogito.event.job; + +import org.kie.kogito.event.AbstractDataEvent; + +public class JobInstanceDataEvent extends AbstractDataEvent { + + public JobInstanceDataEvent(String type, + String source, + byte[] data, + String kogitoProcessInstanceId, + String kogitoRootProcessInstanceId, + String kogitoProcessId, + String kogitoRootProcessId, + String kogitoIdentity) { + super(type, source, data, kogitoProcessInstanceId, kogitoRootProcessInstanceId, kogitoProcessId, + kogitoRootProcessId, null, kogitoIdentity); + } +} \ No newline at end of file diff --git a/api/kogito-events-core/src/main/java/org/kie/kogito/event/process/ProcessInstanceNodeDataEvent.java b/api/kogito-events-core/src/main/java/org/kie/kogito/event/process/ProcessInstanceNodeDataEvent.java index b58f7307ad5..db118aa009f 100644 --- a/api/kogito-events-core/src/main/java/org/kie/kogito/event/process/ProcessInstanceNodeDataEvent.java +++ b/api/kogito-events-core/src/main/java/org/kie/kogito/event/process/ProcessInstanceNodeDataEvent.java @@ -41,4 +41,5 @@ public ProcessInstanceNodeDataEvent(String source, String addons, String identit null, identity); } + } diff --git a/api/kogito-jobs-service-api/pom.xml b/api/kogito-jobs-service-api/pom.xml index ff7b5349f50..a1e9556a92d 100644 --- a/api/kogito-jobs-service-api/pom.xml +++ b/api/kogito-jobs-service-api/pom.xml @@ -25,7 +25,7 @@ kogito-api-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/api/kogito-services/pom.xml b/api/kogito-services/pom.xml index 5d1b11e05cf..587bb99ff32 100644 --- a/api/kogito-services/pom.xml +++ b/api/kogito-services/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-api-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-services diff --git a/api/kogito-services/src/main/java/org/kie/kogito/services/jobs/impl/InMemoryJobService.java b/api/kogito-services/src/main/java/org/kie/kogito/services/jobs/impl/InMemoryJobService.java index 0be813bf499..7653c2eaa89 100644 --- a/api/kogito-services/src/main/java/org/kie/kogito/services/jobs/impl/InMemoryJobService.java +++ b/api/kogito-services/src/main/java/org/kie/kogito/services/jobs/impl/InMemoryJobService.java @@ -112,7 +112,7 @@ public Runnable getSignalProcessInstanceCommand(ProcessInstanceJobDescription de @Override public boolean cancelJob(String id) { - return cancelJob(id, true); + return cancelJob(id, false); } public boolean cancelJob(String id, boolean force) { @@ -174,7 +174,7 @@ public void run() { run(); } finally { if (removeAtExecution) { - cancelJob(id, true); + cancelJob(id, false); } } } diff --git a/api/kogito-timer/pom.xml b/api/kogito-timer/pom.xml index 9d28469ee6d..763a4c87318 100644 --- a/api/kogito-timer/pom.xml +++ b/api/kogito-timer/pom.xml @@ -25,7 +25,7 @@ kogito-api-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/api/pom.xml b/api/pom.xml index 51dc3c4ff61..9880370c7d4 100755 --- a/api/pom.xml +++ b/api/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-build-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../kogito-build/kogito-build-parent/pom.xml diff --git a/drools/kogito-dmn/pom.xml b/drools/kogito-dmn/pom.xml index 67e53718631..1ea158a8ff7 100755 --- a/drools/kogito-dmn/pom.xml +++ b/drools/kogito-dmn/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito drools - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-dmn @@ -100,7 +100,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/drools/kogito-drools/pom.xml b/drools/kogito-drools/pom.xml index 2966101915e..277423ccfe4 100644 --- a/drools/kogito-drools/pom.xml +++ b/drools/kogito-drools/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito drools - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-drools diff --git a/drools/kogito-efesto-drl/pom.xml b/drools/kogito-efesto-drl/pom.xml index 3ed16bf7352..031732d1359 100644 --- a/drools/kogito-efesto-drl/pom.xml +++ b/drools/kogito-efesto-drl/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito drools - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 pom diff --git a/drools/kogito-pmml-api-dependencies/pom.xml b/drools/kogito-pmml-api-dependencies/pom.xml index e0424a4d509..fb0b58f0560 100644 --- a/drools/kogito-pmml-api-dependencies/pom.xml +++ b/drools/kogito-pmml-api-dependencies/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito drools - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-pmml-api-dependencies diff --git a/drools/kogito-pmml-dependencies/pom.xml b/drools/kogito-pmml-dependencies/pom.xml index e818d21ac99..0d1f91a2891 100644 --- a/drools/kogito-pmml-dependencies/pom.xml +++ b/drools/kogito-pmml-dependencies/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito drools - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-pmml-dependencies diff --git a/drools/kogito-pmml-openapi/pom.xml b/drools/kogito-pmml-openapi/pom.xml index c96e9992d46..e747d9f0999 100644 --- a/drools/kogito-pmml-openapi/pom.xml +++ b/drools/kogito-pmml-openapi/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito drools - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/drools/kogito-pmml/pom.xml b/drools/kogito-pmml/pom.xml index 7a32d6b2b4c..f9778abb74a 100644 --- a/drools/kogito-pmml/pom.xml +++ b/drools/kogito-pmml/pom.xml @@ -27,7 +27,7 @@ org.kie.kogito drools - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-pmml @@ -119,7 +119,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/drools/kogito-scenario-simulation/pom.xml b/drools/kogito-scenario-simulation/pom.xml index 529642334aa..01f98cde4ee 100644 --- a/drools/kogito-scenario-simulation/pom.xml +++ b/drools/kogito-scenario-simulation/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito drools - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-scenario-simulation diff --git a/drools/pom.xml b/drools/pom.xml index 12b98682b31..d8f42de8dcd 100755 --- a/drools/pom.xml +++ b/drools/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-build-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../kogito-build/kogito-build-parent/pom.xml diff --git a/grafana-api/pom.xml b/grafana-api/pom.xml index e9e94e311d2..7db7158d28f 100644 --- a/grafana-api/pom.xml +++ b/grafana-api/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-build-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../kogito-build/kogito-build-parent/pom.xml 4.0.0 diff --git a/jbpm/jbpm-bpmn2/pom.xml b/jbpm/jbpm-bpmn2/pom.xml index 3c7b009e862..a801e38ba57 100755 --- a/jbpm/jbpm-bpmn2/pom.xml +++ b/jbpm/jbpm-bpmn2/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito jbpm - 2.0.0-SNAPSHOT + 999-SNAPSHOT jbpm-bpmn2 @@ -74,9 +74,10 @@ - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api provided + 4.0.1 com.sun.xml.bind @@ -84,13 +85,14 @@ provided - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-runtime provided + 4.0.4 - - com.sun.activation - javax.activation + + org.eclipse.angus + angus-activation provided diff --git a/jbpm/jbpm-bpmn2/src/test/filtered-resources/META-INF/persistence.xml b/jbpm/jbpm-bpmn2/src/test/filtered-resources/META-INF/persistence.xml index c9cd63d032a..f81811971d0 100755 --- a/jbpm/jbpm-bpmn2/src/test/filtered-resources/META-INF/persistence.xml +++ b/jbpm/jbpm-bpmn2/src/test/filtered-resources/META-INF/persistence.xml @@ -1,8 +1,8 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"> org.hibernate.jpa.HibernatePersistenceProvider diff --git a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Address.java b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Address.java index fe3ca2c91be..fd9d2eecda3 100755 --- a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Address.java +++ b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Address.java @@ -20,7 +20,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class Address implements Serializable { diff --git a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/NotAvailableGoodsReport.java b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/NotAvailableGoodsReport.java index 8978dee9e8b..fb1a4feb6ed 100755 --- a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/NotAvailableGoodsReport.java +++ b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/NotAvailableGoodsReport.java @@ -18,7 +18,7 @@ */ package org.jbpm.bpmn2.objects; -@javax.xml.bind.annotation.XmlRootElement +@jakarta.xml.bind.annotation.XmlRootElement public class NotAvailableGoodsReport implements java.io.Serializable { static final long serialVersionUID = 1L; diff --git a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Person.java b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Person.java index a299263f2dc..15696358264 100755 --- a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Person.java +++ b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Person.java @@ -20,7 +20,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "person") public class Person implements Serializable { diff --git a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java index b1060256320..45f04b90d8f 100755 --- a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java +++ b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java @@ -22,9 +22,6 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; - import org.jbpm.bpmn2.JbpmBpmn2TestCase; import org.jbpm.bpmn2.objects.Person; import org.jbpm.bpmn2.objects.TestWorkItemHandler; @@ -33,6 +30,9 @@ import org.junit.jupiter.api.Test; import org.kie.kogito.internal.process.runtime.KogitoProcessInstance; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.fail; diff --git a/jbpm/jbpm-bpmn2/src/test/resources/BPMN2-ServiceProcessWithMvelJaxbTransformation.bpmn2 b/jbpm/jbpm-bpmn2/src/test/resources/BPMN2-ServiceProcessWithMvelJaxbTransformation.bpmn2 index fd4c6b32ed3..f4d4503a87d 100755 --- a/jbpm/jbpm-bpmn2/src/test/resources/BPMN2-ServiceProcessWithMvelJaxbTransformation.bpmn2 +++ b/jbpm/jbpm-bpmn2/src/test/resources/BPMN2-ServiceProcessWithMvelJaxbTransformation.bpmn2 @@ -23,7 +23,7 @@ - + diff --git a/jbpm/jbpm-flow-builder/pom.xml b/jbpm/jbpm-flow-builder/pom.xml index 58cd42c4de5..90df7f44afc 100755 --- a/jbpm/jbpm-flow-builder/pom.xml +++ b/jbpm/jbpm-flow-builder/pom.xml @@ -27,7 +27,7 @@ org.kie.kogito jbpm - 2.0.0-SNAPSHOT + 999-SNAPSHOT jbpm-flow-builder diff --git a/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/assembler/DuplicateProcess.java b/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/assembler/DuplicateProcess.java index c0888e7d76c..ea1334743e9 100644 --- a/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/assembler/DuplicateProcess.java +++ b/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/assembler/DuplicateProcess.java @@ -28,16 +28,8 @@ public class DuplicateProcess extends ConfigurableSeverityResult { public static final String KEY = "duplicateProcess"; private static final int[] line = new int[0]; - private String processId; - public DuplicateProcess(Process process, KnowledgeBuilderConfiguration config) { - super(process.getResource(), config); - processId = process.getId(); - } - - @Override - public String getMessage() { - return "Process with same id already exists: " + processId; + super(process.getResource(), config, "Process with same id already exists: " + process.getId()); } @Override diff --git a/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/ProcessLoadError.java b/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/ProcessLoadError.java index b0d95e97728..c7a2b9340db 100644 --- a/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/ProcessLoadError.java +++ b/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/ProcessLoadError.java @@ -25,22 +25,18 @@ * This is used for reporting errors with loading a ruleflow. */ public class ProcessLoadError extends DroolsError { - - private String message; - private Exception exception; private static final int[] lines = new int[0]; public ProcessLoadError(Resource resource, String message, Exception nested) { - super(resource); - this.message = message; - this.exception = nested; + super(resource, getSpecificMessage(message, nested)); } + @Override public int[] getLines() { return this.lines; } - public String getMessage() { + private static String getSpecificMessage(String message, Exception exception) { if (exception != null) { return message + " : Exception " + exception.getClass() + " : " + exception.getMessage(); } else { diff --git a/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/ModelMetaData.java b/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/ModelMetaData.java index 1fba02658ac..b377be1cc8d 100644 --- a/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/ModelMetaData.java +++ b/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/ModelMetaData.java @@ -235,10 +235,10 @@ private CompilationUnit compilationUnit() { private void applyValidation(FieldDeclaration fd, List tags) { if (supportsValidation) { - fd.addAnnotation("javax.validation.Valid"); + fd.addAnnotation("jakarta.validation.Valid"); if (tags != null && tags.contains(Variable.REQUIRED_TAG)) { - fd.addAnnotation("javax.validation.constraints.NotNull"); + fd.addAnnotation("jakarta.validation.constraints.NotNull"); } } } diff --git a/jbpm/jbpm-flow/pom.xml b/jbpm/jbpm-flow/pom.xml index ebf45741039..bdc73748c13 100755 --- a/jbpm/jbpm-flow/pom.xml +++ b/jbpm/jbpm-flow/pom.xml @@ -27,7 +27,7 @@ org.kie.kogito jbpm - 2.0.0-SNAPSHOT + 999-SNAPSHOT jbpm-flow @@ -106,9 +106,10 @@ - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api provided + 4.0.1 diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/ProcessInstance.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/ProcessInstance.java index fa7973511ea..8ede0d974d0 100755 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/ProcessInstance.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/ProcessInstance.java @@ -86,8 +86,6 @@ public interface ProcessInstance extends KogitoProcessInstance, int getSlaCompliance(); - Date getSlaDueDate(); - void configureTimers(); void setReferenceId(String referenceId); diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java index effad1e7866..9db510c92f9 100755 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java @@ -18,11 +18,6 @@ */ package org.jbpm.process.instance.command; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; - import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; import org.kie.api.runtime.KieSession; @@ -31,6 +26,11 @@ import org.kie.kogito.internal.process.runtime.KogitoProcessRuntime; import org.kie.kogito.internal.process.runtime.KogitoWorkflowProcessInstance; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchemaType; + @XmlAccessorType(XmlAccessType.NONE) public class GetProcessInstanceVariableCommand implements ExecutableCommand, KogitoProcessInstanceIdCommand { diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java index 7bd2f26967f..bd128316901 100755 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java @@ -21,12 +21,6 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; - import org.drools.core.common.InternalKnowledgeRuntime; import org.jbpm.workflow.core.impl.NodeImpl; import org.jbpm.workflow.instance.NodeInstanceContainer; @@ -40,6 +34,12 @@ import org.kie.internal.command.RegistryContext; import org.kie.kogito.internal.process.runtime.KogitoProcessRuntime; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; + @XmlRootElement(name = "get-completed-tasks-command") @XmlAccessorType(XmlAccessType.NONE) public class MigrateProcessInstanceCommand implements ExecutableCommand, KogitoProcessInstanceIdCommand { diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java index fd4450262cc..7e737c3f8e3 100755 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java @@ -18,12 +18,6 @@ */ package org.jbpm.process.instance.command; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; - import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; import org.kie.api.runtime.KieSession; @@ -31,6 +25,12 @@ import org.kie.kogito.internal.process.runtime.KogitoProcessInstance; import org.kie.kogito.internal.process.runtime.KogitoProcessRuntime; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; + @XmlRootElement(name = "get-completed-tasks-command") @XmlAccessorType(XmlAccessType.NONE) public class ResumeProcessInstanceCommand implements ExecutableCommand, KogitoProcessInstanceIdCommand { diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java index 37f849d9087..40217c3c9f2 100755 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java @@ -18,12 +18,6 @@ */ package org.jbpm.process.instance.command; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; - import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; import org.kie.api.runtime.KieSession; @@ -31,6 +25,12 @@ import org.kie.kogito.internal.process.runtime.KogitoProcessInstance; import org.kie.kogito.internal.process.runtime.KogitoProcessRuntime; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; + @XmlRootElement(name = "suspend-process-instance-command") @XmlAccessorType(XmlAccessType.NONE) public class SuspendProcessInstanceCommand implements ExecutableCommand, KogitoProcessInstanceIdCommand { diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java index c7b676986f1..7aa140a0aac 100755 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java @@ -18,12 +18,6 @@ */ package org.jbpm.process.instance.command; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; - import org.jbpm.process.instance.impl.ProcessInstanceImpl; import org.kie.api.command.ExecutableCommand; import org.kie.api.runtime.Context; @@ -31,6 +25,12 @@ import org.kie.internal.command.RegistryContext; import org.kie.kogito.internal.process.runtime.KogitoProcessRuntime; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; + @XmlRootElement(name = "update-process-command") @XmlAccessorType(XmlAccessType.NONE) public class UpdateProcessCommand implements ExecutableCommand, KogitoProcessInstanceIdCommand { diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/UserTaskEventImpl.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/UserTaskEventImpl.java index 8bdbb36f42f..dbc1920502f 100644 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/UserTaskEventImpl.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/UserTaskEventImpl.java @@ -90,7 +90,7 @@ public String getEventUser() { @Override public String getUserTaskDefinitionId() { - return getWorkItem().getStringId(); + return getHumanTaskNodeInstance().getNodeDefinitionId(); } } diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/UserTaskStateEventImpl.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/UserTaskStateEventImpl.java index b2d82962cc5..2cacd6063fa 100644 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/UserTaskStateEventImpl.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/UserTaskStateEventImpl.java @@ -48,10 +48,12 @@ public void setNewStatus(String newStatus) { } + @Override public String getNewStatus() { return newStatus; } + @Override public String getOldStatus() { return oldStatus; } diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/impl/humantask/HumanTaskWorkItemDecoratorImpl.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/impl/humantask/HumanTaskWorkItemDecoratorImpl.java index f5a721cbbd0..bea5b2cbb62 100644 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/impl/humantask/HumanTaskWorkItemDecoratorImpl.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/impl/humantask/HumanTaskWorkItemDecoratorImpl.java @@ -387,12 +387,18 @@ public void setTaskName(String taskName) { @Override public void setTaskDescription(String taskDescription) { delegate.setTaskDescription(taskDescription); + if (delegate.getPhaseStatus() == null) { + return; + } getEventSupport().ifPresent(e -> e.fireOneUserTaskStateChange(getProcessInstance(), getNodeInstance(), getKieRuntime(), delegate.getPhaseStatus(), delegate.getPhaseStatus())); } @Override public void setTaskPriority(String taskPriority) { delegate.setTaskPriority(taskPriority); + if (delegate.getPhaseStatus() == null) { + return; + } getEventSupport().ifPresent(e -> e.fireOneUserTaskStateChange(getProcessInstance(), getNodeInstance(), getKieRuntime(), delegate.getPhaseStatus(), delegate.getPhaseStatus())); } @@ -405,6 +411,9 @@ public void setReferenceName(String referenceName) { public void setActualOwner(String actualOwner) { String currentPhaseStatus = delegate.getPhaseStatus(); delegate.setActualOwner(actualOwner); + if (currentPhaseStatus == null) { + return; + } getEventSupport().ifPresent(e -> e.fireOneUserTaskStateChange(getProcessInstance(), getNodeInstance(), getKieRuntime(), currentPhaseStatus, currentPhaseStatus)); } diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/NodeInstance.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/NodeInstance.java index 98a32475c0c..47e84a4f425 100755 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/NodeInstance.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/NodeInstance.java @@ -18,7 +18,6 @@ */ package org.jbpm.workflow.instance; -import java.util.Date; import java.util.Map; import org.jbpm.process.instance.ContextInstance; @@ -51,8 +50,6 @@ public interface NodeInstance extends KogitoNodeInstance { int getSlaCompliance(); - Date getSlaDueDate(); - String getSlaTimerId(); default KogitoProcessInstance getKogitoProcessInstance() { diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/NodeInstanceImpl.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/NodeInstanceImpl.java index af9134308dc..eecc9e33789 100755 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/NodeInstanceImpl.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/NodeInstanceImpl.java @@ -175,6 +175,7 @@ public boolean isInversionOfControl() { return false; } + @Override public CancelType getCancelType() { return cancelType; } @@ -564,6 +565,7 @@ public String getUniqueId() { return result.toString(); } + @Override public Map getMetaData() { return this.metaData; } diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/WorkflowProcessInstanceImpl.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/WorkflowProcessInstanceImpl.java index f095f8f1b2b..e13e3d50248 100755 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/WorkflowProcessInstanceImpl.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/WorkflowProcessInstanceImpl.java @@ -140,6 +140,7 @@ public abstract class WorkflowProcessInstanceImpl extends ProcessInstanceImpl im private Date endDate; private String nodeIdInError; + private String nodeInstanceIdInError; private String errorMessage; private transient Optional errorCause = Optional.empty(); @@ -297,7 +298,7 @@ public List getNodeInstances(final long nodeId, final List org.kie.kogito kogito-build-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../kogito-build/kogito-build-parent/pom.xml diff --git a/jbpm/process-serialization-protobuf/pom.xml b/jbpm/process-serialization-protobuf/pom.xml index cb1eb13f82b..d11b4fc2aa3 100644 --- a/jbpm/process-serialization-protobuf/pom.xml +++ b/jbpm/process-serialization-protobuf/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito jbpm - 2.0.0-SNAPSHOT + 999-SNAPSHOT @@ -109,7 +109,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/jbpm/process-workitems/pom.xml b/jbpm/process-workitems/pom.xml index 79385ae7b88..0fd09828e78 100644 --- a/jbpm/process-workitems/pom.xml +++ b/jbpm/process-workitems/pom.xml @@ -27,7 +27,7 @@ org.kie.kogito jbpm - 2.0.0-SNAPSHOT + 999-SNAPSHOT process-workitems diff --git a/kogito-bom/pom.xml b/kogito-bom/pom.xml index 9324102ecc2..d38f4e4a777 100755 --- a/kogito-bom/pom.xml +++ b/kogito-bom/pom.xml @@ -7,7 +7,7 @@ org.kie.kogito kogito-runtimes - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../pom.xml diff --git a/kogito-build/kogito-build-no-bom-parent/pom.xml b/kogito-build/kogito-build-no-bom-parent/pom.xml index 5220822064e..79eddd725cb 100644 --- a/kogito-build/kogito-build-no-bom-parent/pom.xml +++ b/kogito-build/kogito-build-no-bom-parent/pom.xml @@ -28,7 +28,7 @@ org.kie.kogito kogito-dependencies-bom - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../kogito-dependencies-bom/pom.xml @@ -78,9 +78,9 @@ redislabs/redisearch:${version.org.redis} postgres:${version.org.postgres} - 11 - 11 - 11 + 17 + 17 + 17 false false @@ -117,7 +117,6 @@ 2.5.2 3.2.2 0.8.11 - io.smallrye 3.0.5 3.1.0 2.0 @@ -128,7 +127,7 @@ 4.0.rc2 1.0-beta-1 0.6.1 - 3.6.0 + 3.10.2 0.3 1.0.0 3.1.0 @@ -353,7 +352,7 @@ ${tests.surefire.include} - -Xms2048m -Xmx4g -XX:-TieredCompilation -XX:TieredStopAtLevel=1 -Xverify:none + -Xms2048m -Xmx4g -XX:-TieredCompilation -XX:TieredStopAtLevel=1 ${session.request.localRepositoryPath.path} ${session.request.userSettingsFile.path} @@ -372,7 +371,7 @@ ${tests.failsafe.include} - -Xms2048m -Xmx4g -XX:-TieredCompilation -XX:TieredStopAtLevel=1 -Xverify:none -Dfile.encoding=UTF-8 + -Xms2048m -Xmx4g -XX:-TieredCompilation -XX:TieredStopAtLevel=1 -Dfile.encoding=UTF-8 true false @@ -593,7 +592,7 @@ ${version.plugin.plugin} - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin ${version.jandex.plugin} @@ -639,7 +638,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} @@ -740,18 +739,6 @@ - - productized - - - productized - - - - org.jboss.jandex - 1.2.3 - - run-code-coverage @@ -761,7 +748,7 @@ maven-surefire-plugin - @{jacoco.agent.argLine} -Xms1024m -Xmx4g -XX:-TieredCompilation -XX:TieredStopAtLevel=1 -Xverify:none -Dfile.encoding=UTF-8 + @{jacoco.agent.argLine} -Xms1024m -Xmx4g -XX:-TieredCompilation -XX:TieredStopAtLevel=1 -Dfile.encoding=UTF-8 diff --git a/kogito-build/kogito-build-parent/pom.xml b/kogito-build/kogito-build-parent/pom.xml index 2cd628b5ba4..1f7a65ea4d5 100644 --- a/kogito-build/kogito-build-parent/pom.xml +++ b/kogito-build/kogito-build-parent/pom.xml @@ -28,7 +28,7 @@ org.kie.kogito kogito-build-no-bom-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../kogito-build-no-bom-parent/pom.xml diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-dependencies-bom/pom.xml index 7d14735217c..7138c0d7bf6 100644 --- a/kogito-build/kogito-dependencies-bom/pom.xml +++ b/kogito-build/kogito-dependencies-bom/pom.xml @@ -5,7 +5,7 @@ kogito-build org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -16,79 +16,84 @@ - 2.16.12.Final + 3.2.9.Final ${version.io.quarkus} - 2.6.6 + 3.0.5 3.4.0 1.0.86 - 2.14.2 - 2.14.2 + 2.15.2 + 2.15.2 2.8.0 2.4.10 1.0.0-preview.20220705 - 1.1.0 - 1.3.14 - 0.0.6 - 1.1.5 - 0.0.9 + 2.0.1 + 2.2.9 + 0.2.0 + 2.0.2 + 0.1.3 1.5.2 - 3.24.2 - 2.14.2 + 3.25.1 + 2.15.2 4.18.0 2.33.2 3.22.0 - 2.10 + 2.10.1 - 21.3.0.0 + 21.5.0.0 2.3.0.1 2.3.5 - 1.2.0 + 2.0.1 1.3.2 1.3.2 - 1 + 2.0.1 2.0.1.Final 2.3.1 - 2.0.1 - 1.2.9 + 3.1.1 + 1.4.7 2.3.0 - 6.3.1 - 1.10.2 - 9.8.3 - 42.5.1 + + 6.7.2 + 1.11.1 + 9.16.3 + 42.6.0 4.0.5.Final - 3.1.1 + 3.4.0 4.2.0 - 2.30.1 + 3.7.2 - 4.3.7 - 1.53.0 + 4.4.6 + 1.56.0 - 2.15.0 + 3.0.0-M1 - 2.1.16 - 2.2.14 + 2.1.19 + 2.2.19 3.12.0 - 22.3.0 + 23.0.1 - 14.0.6.Final - 4.5.1.Final + 14.0.7.Final + 4.6.2.Final 7.10.2 - 2.1.6 - 4.7.7.Final - 20.0.2 + 3.1.0 + 6.2.4.Final + 21.0.1 2.12-2.2.1 - 4.6.1 + 4.9.1 4.4.14 1.7.13 2.0.4 @@ -97,35 +102,35 @@ 3.22.0 2.9.0 1.3 - 8.2 + 9.2 5.${version.org.junit.minor} - 5.9.2 - 5.9.2 - 1.9.2 + 5.9.3 + 5.9.3 + 1.9.3 1.5.0 4.11.0 1.17.6 2.9.1 - 4.5.1 + 5.3.2 - 1.12.18 + 1.14.7 2.5.0.Final - 1.0.3 + 1.0.4 0.10.2 - 1.7.36 + 2.0.6 - 3.8.6 - 3.6.0 + 3.9.3 + 3.7.1 3.2.0 - 1.6 + 2.1.0 2.6.0 1.0-1 - 4.1.1 - 32.0.1-jre + 4.2.0 + 32.0.0-jre 1.24.0 @@ -273,8 +278,8 @@ ${version.com.fasterxml.jackson} - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider + com.fasterxml.jackson.jakarta.rs + jackson-jakarta-rs-json-provider ${version.com.fasterxml.jackson} @@ -284,7 +289,7 @@ com.fasterxml.jackson.module - jackson-module-jaxb-annotations + jackson-module-jakarta-xmlbind-annotations ${version.com.fasterxml.jackson} @@ -514,6 +519,12 @@ ${version.com.github.tomakehurst.wiremock} test + + com.github.tomakehurst + wiremock-jre8-standalone + ${version.com.github.tomakehurst.wiremock} + test + org.apache.maven.shared @@ -564,9 +575,9 @@ - javax.xml.bind - jaxb-api - ${version.javax.xml.bind} + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.0 com.sun.xml.bind @@ -574,29 +585,29 @@ ${version.com.sun.xml.bind.core} - com.sun.xml.bind - jaxb-impl - ${version.com.sun.xml.bind.impl} + org.glassfish.jaxb + jaxb-runtime + 4.0.3 - com.sun.activation - javax.activation + org.eclipse.angus + angus-activation ${version.com.sun.activation} - javax.validation - validation-api - ${version.javax.validation} + jakarta.validation + jakarta.validation-api + 3.0.2 - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api ${version.javax.inject} - javax.annotation - javax.annotation-api - ${version.javax.annotation} + jakarta.annotation + jakarta.annotation-api + 2.1.1 org.eclipse.microprofile.openapi @@ -634,18 +645,6 @@ ${version.io.swagger.core.v3} - - - io.fabric8 - kubernetes-client - ${version.io.fabric8.kubernetes-client} - - - io.fabric8 - knative-client - ${version.io.fabric8.kubernetes-client} - - org.infinispan @@ -654,7 +653,7 @@ org.infinispan - infinispan-client-hotrod + infinispan-client-hotrod-jakarta ${version.org.infinispan} diff --git a/kogito-build/kogito-ide-config/pom.xml b/kogito-build/kogito-ide-config/pom.xml index 101db9a286e..cefa7aedc79 100644 --- a/kogito-build/kogito-ide-config/pom.xml +++ b/kogito-build/kogito-ide-config/pom.xml @@ -5,7 +5,7 @@ kogito-runtimes org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/kogito-build/kogito-kie-bom/pom.xml b/kogito-build/kogito-kie-bom/pom.xml index a900ed54a3f..836f4c4cbd3 100644 --- a/kogito-build/kogito-kie-bom/pom.xml +++ b/kogito-build/kogito-kie-bom/pom.xml @@ -5,7 +5,7 @@ org.kie.kogito kogito-build - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../pom.xml 4.0.0 @@ -18,7 +18,7 @@ - 8.45.0-SNAPSHOT + 999-SNAPSHOT diff --git a/kogito-build/pom.xml b/kogito-build/pom.xml index 86a05563040..bdf1049287c 100644 --- a/kogito-build/pom.xml +++ b/kogito-build/pom.xml @@ -7,7 +7,7 @@ org.kie.kogito kogito-runtimes - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../pom.xml diff --git a/kogito-codegen-modules/GUIDELINES.adoc b/kogito-codegen-modules/GUIDELINES.adoc index d0840addb4f..909d7a2b316 100644 --- a/kogito-codegen-modules/GUIDELINES.adoc +++ b/kogito-codegen-modules/GUIDELINES.adoc @@ -157,14 +157,14 @@ This is the end-result when the class is rendered: .TravelersMessageConsumer_3.java [source,java] ---- -@javax.enterprise.context.ApplicationScoped() +@jakarta.enterprise.context.ApplicationScoped() public class TravelersMessageConsumer_3 { - @javax.inject.Inject() - @javax.inject.Named("Travelers") + @jakarta.inject.Inject() + @jakarta.inject.Named("Travelers") Process process; - @javax.inject.Inject() + @jakarta.inject.Inject() Application application; @org.eclipse.microprofile.config.inject.ConfigProperty(name = "kogito.messaging.as-cloudevents") @@ -219,7 +219,7 @@ u.findAll(FieldDeclaration.class, if (isSpring()) { vd.setType("java.util.List"); } else { - vd.setType("javax.enterprise.inject.Instance"); + vd.setType("jakarta.enterprise.inject.Instance"); } }); ---- @@ -292,7 +292,7 @@ public class TravelersProcess extends AbstractProcess { // post construct method that delegates to a non-final // super-class method - @javax.annotation.PostConstruct() + @jakarta.annotation.PostConstruct() public void init() { this.activate(); } diff --git a/kogito-codegen-modules/kogito-codegen-api/pom.xml b/kogito-codegen-modules/kogito-codegen-api/pom.xml index 65b8a3915a2..b9e6e518943 100644 --- a/kogito-codegen-modules/kogito-codegen-api/pom.xml +++ b/kogito-codegen-modules/kogito-codegen-api/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-codegen-modules - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 kogito-codegen-api diff --git a/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/context/impl/QuarkusKogitoBuildContext.java b/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/context/impl/QuarkusKogitoBuildContext.java index a8452706640..f6e0881f571 100644 --- a/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/context/impl/QuarkusKogitoBuildContext.java +++ b/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/context/impl/QuarkusKogitoBuildContext.java @@ -24,8 +24,8 @@ public class QuarkusKogitoBuildContext extends AbstractKogitoBuildContext { public static final String CONTEXT_NAME = "Quarkus"; - public static final String QUARKUS_REST = "javax.ws.rs.Path"; - public static final String QUARKUS_DI = "javax.inject.Inject"; + public static final String QUARKUS_REST = "jakarta.ws.rs.Path"; + public static final String QUARKUS_DI = "jakarta.inject.Inject"; protected QuarkusKogitoBuildContext(QuarkusKogitoBuildContextBuilder builder) { super(builder, new CDIDependencyInjectionAnnotator(), new CDIRestAnnotator(), CONTEXT_NAME); diff --git a/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/utils/KogitoCodeGenConstants.java b/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/utils/KogitoCodeGenConstants.java index 64927dd573d..70c2da73a9f 100644 --- a/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/utils/KogitoCodeGenConstants.java +++ b/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/utils/KogitoCodeGenConstants.java @@ -24,7 +24,7 @@ private KogitoCodeGenConstants() { } - public static final String VALIDATION_CLASS = "javax.validation.constraints.NotNull"; + public static final String VALIDATION_CLASS = "jakarta.validation.constraints.NotNull"; public static final String OPENAPI_SPEC_CLASS = "org.eclipse.microprofile.openapi.annotations.media.Schema"; /** * Property that controls whether Kogito Codegen should ignore hidden files. Defaults to true. diff --git a/kogito-codegen-modules/kogito-codegen-core/pom.xml b/kogito-codegen-modules/kogito-codegen-core/pom.xml index ffd5cc3aea9..a82508d42ba 100644 --- a/kogito-codegen-modules/kogito-codegen-core/pom.xml +++ b/kogito-codegen-modules/kogito-codegen-core/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-codegen-modules - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 kogito-codegen-core diff --git a/kogito-codegen-modules/kogito-codegen-core/src/main/java/org/kie/kogito/codegen/core/io/CollectedResourceProducer.java b/kogito-codegen-modules/kogito-codegen-core/src/main/java/org/kie/kogito/codegen/core/io/CollectedResourceProducer.java index 5be57addb84..e0859fdfadd 100644 --- a/kogito-codegen-modules/kogito-codegen-core/src/main/java/org/kie/kogito/codegen/core/io/CollectedResourceProducer.java +++ b/kogito-codegen-modules/kogito-codegen-core/src/main/java/org/kie/kogito/codegen/core/io/CollectedResourceProducer.java @@ -21,6 +21,7 @@ import java.io.File; import java.io.IOException; import java.io.UncheckedIOException; +import java.nio.charset.StandardCharsets; import java.nio.file.FileVisitOption; import java.nio.file.FileVisitResult; import java.nio.file.Files; @@ -103,7 +104,7 @@ public static Collection fromJarFile(Path jarPath) { Enumeration entries = zipFile.entries(); while (entries.hasMoreElements()) { ZipEntry entry = entries.nextElement(); - InternalResource resource = new ByteArrayResource(readBytesFromInputStream(zipFile.getInputStream(entry))); + InternalResource resource = new ByteArrayResource(readBytesFromInputStream(zipFile.getInputStream(entry)), StandardCharsets.UTF_8.name()); resource.setSourcePath(entry.getName()); resources.add(toCollectedResource(jarPath, entry.getName(), resource)); } @@ -171,7 +172,7 @@ public static Collection fromFiles(Path basePath, boolean ign } private static CollectedResource toCollectedResource(Path basePath, File file) { - Resource resource = new FileSystemResource(file); + Resource resource = new FileSystemResource(file, StandardCharsets.UTF_8.name()); return toCollectedResource(basePath, file.getName(), resource); } 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 107ffe7059b..e75602e1312 100644 --- 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 @@ -18,13 +18,13 @@ */ package $Package$; -@javax.inject.Singleton +@jakarta.inject.Singleton public class Application extends org.kie.kogito.StaticApplication { - @javax.inject.Inject + @jakarta.inject.Inject public Application( org.kie.kogito.Config config, - javax.enterprise.inject.Instance engines) { + jakarta.enterprise.inject.Instance engines) { super(config, engines); } } diff --git a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ApplicationConfigQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ApplicationConfigQuarkusTemplate.java index 547a3246985..a329586e4bf 100644 --- a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ApplicationConfigQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ApplicationConfigQuarkusTemplate.java @@ -18,12 +18,12 @@ */ package $Package$; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; -@javax.inject.Singleton +@jakarta.inject.Singleton public class ApplicationConfig extends org.kie.kogito.StaticConfig { - @javax.inject.Inject + @jakarta.inject.Inject public ApplicationConfig( Instance configs) { super($Addons$, configs); diff --git a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ConfigBeanSpringTemplate.java b/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ConfigBeanSpringTemplate.java index e924e968cf3..f0f09df0c55 100644 --- a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ConfigBeanSpringTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ConfigBeanSpringTemplate.java @@ -30,7 +30,7 @@ public class ConfigBean extends org.kie.kogito.config.StaticConfigBean { @org.springframework.beans.factory.annotation.Value("${kogito.jackson.fail-on-empty-bean:#{false}}") boolean failOnEmptyBean; - @javax.annotation.PostConstruct + @jakarta.annotation.PostConstruct protected void init() { setServiceUrl(kogitoService.orElse("")); setCloudEvents(useCloudEvents); diff --git a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/GlobalObjectMapperQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/GlobalObjectMapperQuarkusTemplate.java index 219b971df93..050097b1d13 100644 --- a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/GlobalObjectMapperQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/GlobalObjectMapperQuarkusTemplate.java @@ -18,11 +18,11 @@ */ package $Package$; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import java.util.TimeZone; -import javax.inject.Inject; +import jakarta.inject.Inject; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; diff --git a/kogito-codegen-modules/kogito-codegen-decisions/pom.xml b/kogito-codegen-modules/kogito-codegen-decisions/pom.xml index ea001ce8145..2a08c817285 100644 --- a/kogito-codegen-modules/kogito-codegen-decisions/pom.xml +++ b/kogito-codegen-modules/kogito-codegen-decisions/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-codegen-modules - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 kogito-codegen-decisions diff --git a/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionRestResourceGenerator.java b/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionRestResourceGenerator.java index 12b0f7bfa17..89ddb88e6f2 100644 --- a/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionRestResourceGenerator.java +++ b/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionRestResourceGenerator.java @@ -292,7 +292,7 @@ private MethodDeclaration cloneForDMNResult(MethodDeclaration dmnMethod, String private void interpolateRequestPath(String pathName, String placeHolder, MethodDeclaration clonedDmnMethod) { clonedDmnMethod.getAnnotations().stream() - .filter(a -> a.getNameAsString().endsWith("Path") || a.getNameAsString().endsWith("PostMapping")) // e.g.: @javax.ws.rs.Path("/DSn/dmnresult") or @org.springframework.web.bind.annotation.PostMapping(value = "$dmnMethodUrl$", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + .filter(a -> a.getNameAsString().endsWith("Path") || a.getNameAsString().endsWith("PostMapping")) // e.g.: @jakarta.ws.rs.Path("/DSn/dmnresult") or @org.springframework.web.bind.annotation.PostMapping(value = "$dmnMethodUrl$", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) .flatMap(a -> a.findAll(StringLiteralExpr.class).stream()) .forEach(vv -> { String s = vv.getValue(); diff --git a/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionContainerQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionContainerQuarkusTemplate.java index f63fbaa3153..401755fa811 100644 --- a/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionContainerQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionContainerQuarkusTemplate.java @@ -18,7 +18,7 @@ */ package $Package$; -@javax.enterprise.context.ApplicationScoped() +@jakarta.enterprise.context.ApplicationScoped() @io.quarkus.runtime.Startup() //<-- Required to force full reload during hot reload public class DecisionModels extends org.kie.kogito.dmn.AbstractDecisionModels { @@ -27,14 +27,14 @@ public class DecisionModels extends org.kie.kogito.dmn.AbstractDecisionModels { /* arguments provided during codegen */); } - @javax.inject.Inject + @jakarta.inject.Inject protected org.kie.kogito.Application application; public DecisionModels() { super(); } - @javax.annotation.PostConstruct + @jakarta.annotation.PostConstruct protected void init() { initApplication(application); } diff --git a/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionRestResourceQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionRestResourceQuarkusTemplate.java index bc71d6ad53e..a14ff6013a3 100644 --- a/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionRestResourceQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionRestResourceQuarkusTemplate.java @@ -22,14 +22,14 @@ import java.util.Objects; import java.util.stream.Collectors; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; import org.kie.dmn.feel.codegen.feel11.CodegenStringUtil; import org.kie.kogito.Application; @@ -87,7 +87,7 @@ private ResponseBuilder extractContextIfSucceded(KogitoDMNResult result){ } private ResponseBuilder buildFailedEvaluationResponse(KogitoDMNResult result){ - return Response.status(javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR).entity(result); + return Response.status(jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR).entity(result); } private ResponseBuilder extractStronglyTypedContextIfSucceded(KogitoDMNResult result) { diff --git a/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/config/DecisionConfigQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/config/DecisionConfigQuarkusTemplate.java index c38aecc6d81..aa9d4b9eeea 100644 --- a/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/config/DecisionConfigQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/config/DecisionConfigQuarkusTemplate.java @@ -25,17 +25,17 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.kie.dmn.api.core.event.DMNRuntimeEventListener; import org.kie.kogito.decision.DecisionEventListenerConfig; import org.kie.kogito.dmn.config.AbstractDecisionConfig; import org.kie.kogito.rules.RuleEventListenerConfig; -@javax.inject.Singleton +@jakarta.inject.Singleton class DecisionConfig extends AbstractDecisionConfig { - @javax.inject.Inject + @jakarta.inject.Inject public DecisionConfig( Instance decisionEventListenerConfigs, Instance dmnRuntimeEventListeners) { diff --git a/kogito-codegen-modules/kogito-codegen-integration-tests/pom.xml b/kogito-codegen-modules/kogito-codegen-integration-tests/pom.xml index ae9118c0a8c..320b7c74285 100644 --- a/kogito-codegen-modules/kogito-codegen-integration-tests/pom.xml +++ b/kogito-codegen-modules/kogito-codegen-integration-tests/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-codegen-modules - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 kogito-codegen-integration-tests diff --git a/kogito-codegen-modules/kogito-codegen-predictions/pom.xml b/kogito-codegen-modules/kogito-codegen-predictions/pom.xml index 72d93ac4d1e..20c4262a364 100644 --- a/kogito-codegen-modules/kogito-codegen-predictions/pom.xml +++ b/kogito-codegen-modules/kogito-codegen-predictions/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-codegen-modules - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 kogito-codegen-predictions diff --git a/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/PMMLRestResourceQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/PMMLRestResourceQuarkusTemplate.java index 80c8edfc7ff..ab5b6009db1 100644 --- a/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/PMMLRestResourceQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/PMMLRestResourceQuarkusTemplate.java @@ -20,11 +20,11 @@ import java.util.Collections; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.kie.kogito.Application; @@ -56,11 +56,11 @@ public org.kie.api.pmml.PMML4Result descriptive(java.util.Map va return super.descriptive(application, FILE_NAME, MODEL_NAME, variables); } - @javax.ws.rs.ext.Provider - public static class ErrorExceptionMapper implements javax.ws.rs.ext.ExceptionMapper { + @jakarta.ws.rs.ext.Provider + public static class ErrorExceptionMapper implements jakarta.ws.rs.ext.ExceptionMapper { - public javax.ws.rs.core.Response toResponse(java.lang.Exception e) { - return javax.ws.rs.core.Response.status(javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR).entity(org.kie.kogito.pmml.AbstractPMMLRestResource.getJsonErrorMessage(e)).build(); + public jakarta.ws.rs.core.Response toResponse(java.lang.Exception e) { + return jakarta.ws.rs.core.Response.status(jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR).entity(org.kie.kogito.pmml.AbstractPMMLRestResource.getJsonErrorMessage(e)).build(); } } diff --git a/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/PredictionModelsQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/PredictionModelsQuarkusTemplate.java index d5cfad7e910..7deb7d26d06 100644 --- a/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/PredictionModelsQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/PredictionModelsQuarkusTemplate.java @@ -18,7 +18,7 @@ */ package $Package$; -@javax.enterprise.context.ApplicationScoped() +@jakarta.enterprise.context.ApplicationScoped() public class PredictionModels extends org.kie.kogito.pmml.AbstractPredictionModels { static { diff --git a/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/config/PredictionConfigQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/config/PredictionConfigQuarkusTemplate.java index 3fc484363c6..8ec7773081c 100644 --- a/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/config/PredictionConfigQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/config/PredictionConfigQuarkusTemplate.java @@ -25,15 +25,15 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.kie.kogito.pmml.config.AbstractPredictionConfig; import org.kie.kogito.prediction.PredictionEventListenerConfig; -@javax.inject.Singleton +@jakarta.inject.Singleton class PredictionConfig extends AbstractPredictionConfig { - @javax.inject.Inject + @jakarta.inject.Inject public PredictionConfig( Instance predictionEventListenerConfigs) { super(predictionEventListenerConfigs); diff --git a/kogito-codegen-modules/kogito-codegen-predictions/src/test/java/org/kie/kogito/codegen/prediction/config/PredictionConfigGeneratorTest.java b/kogito-codegen-modules/kogito-codegen-predictions/src/test/java/org/kie/kogito/codegen/prediction/config/PredictionConfigGeneratorTest.java index c6dd2951857..e5b5e71e454 100644 --- a/kogito-codegen-modules/kogito-codegen-predictions/src/test/java/org/kie/kogito/codegen/prediction/config/PredictionConfigGeneratorTest.java +++ b/kogito-codegen-modules/kogito-codegen-predictions/src/test/java/org/kie/kogito/codegen/prediction/config/PredictionConfigGeneratorTest.java @@ -39,9 +39,9 @@ void compilationUnitWithCDI() { GeneratedFile retrieved = predictionConfigGenerator.generate(); assertNotNull(retrieved); String retrievedContent = new String(retrieved.contents()); - String expected = "@javax.inject.Singleton"; + String expected = "@jakarta.inject.Singleton"; assertTrue(retrievedContent.contains(expected)); - expected = "@javax.inject.Inject"; + expected = "@jakarta.inject.Inject"; assertTrue(retrievedContent.contains(expected)); String unexpected = "@org.springframework.stereotype.Component"; assertFalse(retrievedContent.contains(unexpected)); @@ -60,9 +60,9 @@ void compilationUnitWithSpring() { assertTrue(retrievedContent.contains(expected)); expected = "@org.springframework.beans.factory.annotation.Autowired"; assertTrue(retrievedContent.contains(expected)); - String unexpected = "@javax.inject.Singleton"; + String unexpected = "@jakarta.inject.Singleton"; assertFalse(retrievedContent.contains(unexpected)); - unexpected = "@javax.inject.Inject"; + unexpected = "@jakarta.inject.Inject"; assertFalse(retrievedContent.contains(unexpected)); } } \ No newline at end of file diff --git a/kogito-codegen-modules/kogito-codegen-processes-integration-tests/pom.xml b/kogito-codegen-modules/kogito-codegen-processes-integration-tests/pom.xml index 01e7cfdbff2..77eae9d4fc5 100644 --- a/kogito-codegen-modules/kogito-codegen-processes-integration-tests/pom.xml +++ b/kogito-codegen-modules/kogito-codegen-processes-integration-tests/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-codegen-modules - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 kogito-codegen-processes-integration-tests diff --git a/kogito-codegen-modules/kogito-codegen-processes-integration-tests/src/test/java/org/kie/kogito/codegen/tests/PublishEventIT.java b/kogito-codegen-modules/kogito-codegen-processes-integration-tests/src/test/java/org/kie/kogito/codegen/tests/PublishEventIT.java index 6994a398018..60f4d83164a 100644 --- a/kogito-codegen-modules/kogito-codegen-processes-integration-tests/src/test/java/org/kie/kogito/codegen/tests/PublishEventIT.java +++ b/kogito-codegen-modules/kogito-codegen-processes-integration-tests/src/test/java/org/kie/kogito/codegen/tests/PublishEventIT.java @@ -137,7 +137,7 @@ public void testCompensationProcess() throws Exception { assertProcessInstanceEvent(event.get(), "compensateAll", "Compensate All", ProcessInstanceStateEventBody.EVENT_TYPE_ENDED); - List nodes = findNodeInstanceEvents(events, 2); + List nodes = findNodeInstanceEvents(events, ProcessInstanceNodeEventBody.EVENT_TYPE_EXIT); assertThat(nodes).hasSize(9).extractingResultOf("getNodeType").contains("StartNode", "ActionNode", "BoundaryEventNode", "EndNode"); } @@ -284,7 +284,7 @@ public void testBasicUserTaskProcessAbort() throws Exception { events = publisher.extract(); assertThat(events).hasSize(4); - triggered = findNodeInstanceEvents(events, 2); + triggered = findNodeInstanceEvents(events, ProcessInstanceNodeEventBody.EVENT_TYPE_ABORTED); assertThat(triggered).hasSize(1).extractingResultOf("getNodeName").containsOnly("First Task"); assertProcessInstanceEvent(events.get(3), "UserTasksProcess", "UserTasksProcess", ProcessInstance.STATE_ABORTED); diff --git a/kogito-codegen-modules/kogito-codegen-processes/pom.xml b/kogito-codegen-modules/kogito-codegen-processes/pom.xml index 6029d9bae8f..025d238dae7 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/pom.xml +++ b/kogito-codegen-modules/kogito-codegen-processes/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-codegen-modules - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 kogito-codegen-processes @@ -117,8 +117,8 @@ test - javax.validation - validation-api + jakarta.validation + jakarta.validation-api test diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessGenerator.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessGenerator.java index 492e471925d..00eda479eb1 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessGenerator.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessGenerator.java @@ -436,7 +436,7 @@ public ClassOrInterfaceDeclaration classDeclaration() { if (context.hasDI()) { context.getDependencyInjectionAnnotator().withApplicationComponent(handlerClazz); context.getDependencyInjectionAnnotator() - .withOptionalInjection( + .withInjection( handlerClazz .getConstructors() .stream() diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessResourceGenerator.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessResourceGenerator.java index dfbb92dfb5d..90ab0277b06 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessResourceGenerator.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessResourceGenerator.java @@ -368,8 +368,8 @@ private void enableValidation(ClassOrInterfaceDeclaration template) { } private void insertValidationAnnotations(Parameter param) { - param.addAnnotation("javax.validation.Valid"); - param.addAnnotation("javax.validation.constraints.NotNull"); + param.addAnnotation("jakarta.validation.Valid"); + param.addAnnotation("jakarta.validation.constraints.NotNull"); } private void initializeProcessField(FieldDeclaration fd) { diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageConsumerQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageConsumerQuarkusTemplate.java index 1d8c9904f7c..58b6087fcf4 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageConsumerQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageConsumerQuarkusTemplate.java @@ -22,8 +22,8 @@ import java.util.Optional; import java.util.Set; import java.util.function.Function; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.kie.kogito.process.Process; import org.kie.kogito.addon.quarkus.messaging.common.QuarkusMessageConsumer; @@ -42,7 +42,7 @@ public class $Type$MessageConsumer extends QuarkusMessageConsumer<$Type$, $DataT private Set correlation; - @javax.annotation.PostConstruct + @jakarta.annotation.PostConstruct void init() { init(process,"$Trigger$",$DataType$.class, eventReceiver, correlation); } diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageConsumerSpringTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageConsumerSpringTemplate.java index b42dac9013c..49fbd2f0491 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageConsumerSpringTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageConsumerSpringTemplate.java @@ -25,7 +25,7 @@ import org.kie.kogito.addon.cloudevents.spring.SpringMessageConsumer; import org.kie.kogito.event.EventReceiver; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageProducerQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageProducerQuarkusTemplate.java index 5d89c76f65b..5a983df089b 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageProducerQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageProducerQuarkusTemplate.java @@ -21,7 +21,7 @@ import org.kie.kogito.internal.process.runtime.KogitoProcessInstance; import org.kie.kogito.event.EventEmitter; import org.kie.kogito.event.impl.AbstractMessageProducer; -import javax.inject.Inject; +import jakarta.inject.Inject; @io.quarkus.runtime.Startup public class MessageProducer extends AbstractMessageProducer<$DataType$> { @@ -29,7 +29,7 @@ public class MessageProducer extends AbstractMessageProducer<$DataType$> { @Inject EventEmitter emitter; - @javax.annotation.PostConstruct + @jakarta.annotation.PostConstruct public void init() { init(emitter,"$Trigger$"); } diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ProcessContainerQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ProcessContainerQuarkusTemplate.java index 014f830f489..977f351c64c 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ProcessContainerQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ProcessContainerQuarkusTemplate.java @@ -18,15 +18,15 @@ */ package $Package$; -@javax.enterprise.context.ApplicationScoped +@jakarta.enterprise.context.ApplicationScoped public class Processes implements org.kie.kogito.process.Processes { - @javax.inject.Inject - javax.enterprise.inject.Instance> processes; + @jakarta.inject.Inject + jakarta.enterprise.inject.Instance> processes; private java.util.Map> mappedProcesses = new java.util.HashMap<>(); - @javax.annotation.PostConstruct + @jakarta.annotation.PostConstruct public void setup() { for (org.kie.kogito.process.Process process : processes) { mappedProcesses.put(process.id(), process); diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ProcessContainerSpringTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ProcessContainerSpringTemplate.java index a7b9dc9b389..85badab09a3 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ProcessContainerSpringTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ProcessContainerSpringTemplate.java @@ -27,7 +27,7 @@ public class Processes implements org.kie.kogito.process.Processes { private java.util.Map> mappedProcesses = new java.util.HashMap<>(); - @javax.annotation.PostConstruct + @jakarta.annotation.PostConstruct public void setup() { for (org.kie.kogito.process.Process process : processes) { mappedProcesses.put(process.id(), process); diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ReactiveRestResourceQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ReactiveRestResourceQuarkusTemplate.java index 944920ef74e..4701acf96be 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ReactiveRestResourceQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ReactiveRestResourceQuarkusTemplate.java @@ -25,20 +25,20 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import org.jbpm.util.JsonSchemaUtil; import org.kie.kogito.process.Process; diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/RestResourceQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/RestResourceQuarkusTemplate.java index 773efa42654..bd40424d924 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/RestResourceQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/RestResourceQuarkusTemplate.java @@ -24,26 +24,26 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.PATCH; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.core.Response.Status; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.PATCH; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Response.Status; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.tags.Tag; diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/RestResourceUserTaskQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/RestResourceUserTaskQuarkusTemplate.java index 3ab9387965c..34c0d6a96dd 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/RestResourceUserTaskQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/RestResourceUserTaskQuarkusTemplate.java @@ -20,10 +20,10 @@ import java.util.List; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.kie.kogito.auth.IdentityProviders; import org.kie.kogito.auth.SecurityPolicy; 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 35dfd11fcbe..19491e3b91b 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 @@ -18,7 +18,7 @@ */ package $Package$; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.kie.api.event.process.ProcessEventListener; import org.kie.kogito.auth.IdentityProvider; @@ -30,10 +30,10 @@ import org.kie.kogito.uow.UnitOfWorkManager; import org.kie.kogito.uow.events.UnitOfWorkEventListener; -@javax.inject.Singleton +@jakarta.inject.Singleton public class ProcessConfig extends org.kie.kogito.process.impl.AbstractProcessConfig { - @javax.inject.Inject + @jakarta.inject.Inject public ProcessConfig( Instance workItemHandlerConfig, Instance unitOfWorkManager, 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 1b6f040386d..1c66cb175a4 100644 --- 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 @@ -21,8 +21,8 @@ import java.util.Arrays; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import org.apache.kafka.streams.Topology; import org.slf4j.Logger; diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/producer/ProcessServiceProducerQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/producer/ProcessServiceProducerQuarkusTemplate.java index 280b3209eb7..919f3ac3134 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/producer/ProcessServiceProducerQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/producer/ProcessServiceProducerQuarkusTemplate.java @@ -18,8 +18,8 @@ */ package $Package$; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import org.kie.kogito.Application; import org.kie.kogito.process.ProcessService; diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/data/HelloModel.java b/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/data/HelloModel.java index 4b58ec25bac..3ef8eabe81b 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/data/HelloModel.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/data/HelloModel.java @@ -38,7 +38,7 @@ public String getId() { @org.kie.kogito.codegen.VariableInfo(tags = "") @com.fasterxml.jackson.annotation.JsonProperty(value = "person") - @javax.validation.Valid() + @jakarta.validation.Valid() private Person person; public Person getPerson() { @@ -51,7 +51,7 @@ public void setPerson(Person person) { @org.kie.kogito.codegen.VariableInfo(tags = "") @com.fasterxml.jackson.annotation.JsonProperty(value = "var2") - @javax.validation.Valid() + @jakarta.validation.Valid() private String var2; public String getVar2() { @@ -64,7 +64,7 @@ public void setVar2(String var2) { @org.kie.kogito.codegen.VariableInfo(tags = "") @com.fasterxml.jackson.annotation.JsonProperty(value = "var1") - @javax.validation.Valid() + @jakarta.validation.Valid() private String var1; public String getVar1() { diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/openapi/SimpleResource.java b/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/openapi/SimpleResource.java index 72f3879838f..93a30ce8f5f 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/openapi/SimpleResource.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/openapi/SimpleResource.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.tags.Tag; diff --git a/kogito-codegen-modules/kogito-codegen-rules/pom.xml b/kogito-codegen-modules/kogito-codegen-rules/pom.xml index 2d4002d820b..ed9bcd4bc6f 100644 --- a/kogito-codegen-modules/kogito-codegen-rules/pom.xml +++ b/kogito-codegen-modules/kogito-codegen-rules/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-codegen-modules - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 kogito-codegen-rules diff --git a/kogito-codegen-modules/kogito-codegen-rules/src/main/java/org/kie/kogito/codegen/rules/QueryGenerator.java b/kogito-codegen-modules/kogito-codegen-rules/src/main/java/org/kie/kogito/codegen/rules/QueryGenerator.java index d0e98d00c14..8057df88934 100644 --- a/kogito-codegen-modules/kogito-codegen-rules/src/main/java/org/kie/kogito/codegen/rules/QueryGenerator.java +++ b/kogito-codegen-modules/kogito-codegen-rules/src/main/java/org/kie/kogito/codegen/rules/QueryGenerator.java @@ -212,14 +212,10 @@ public static class NoBindingQuery extends DroolsError { private final QueryModel query; public NoBindingQuery(QueryModel query) { + super("Query " + query.getName() + " has no bound variable. At least one binding is required to determine the value returned by this query"); this.query = query; } - @Override - public String getMessage() { - return "Query " + query.getName() + " has no bound variable. At least one binding is required to determine the value returned by this query"; - } - @Override public int[] getLines() { return ERROR_LINES; diff --git a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java index ee72ea81e3a..bc53ce9f069 100644 --- a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java @@ -18,17 +18,17 @@ */ package $Package$; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.kie.kogito.drools.core.config.AbstractRuleConfig; import org.kie.api.event.rule.AgendaEventListener; import org.kie.api.event.rule.RuleRuntimeEventListener; import org.kie.kogito.rules.RuleEventListenerConfig; -@javax.inject.Singleton +@jakarta.inject.Singleton class RuleConfig extends AbstractRuleConfig implements org.kie.kogito.rules.RuleConfig { - @javax.inject.Inject + @jakarta.inject.Inject public RuleConfig( Instance ruleEventListenerConfigs, Instance agendaEventListeners, diff --git a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/EventDrivenExecutorQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/EventDrivenExecutorQuarkusTemplate.java index a2f8cf740fe..aa82ea7c569 100644 --- a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/EventDrivenExecutorQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/EventDrivenExecutorQuarkusTemplate.java @@ -18,9 +18,9 @@ */ package com.myspace.demo; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.kie.kogito.eventdriven.rules.AbstractEventDrivenQueryExecutor; import org.drools.ruleunits.api.RuleUnit; diff --git a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RuleUnitContainerQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RuleUnitContainerQuarkusTemplate.java index 141c98bad0d..b469b9dc6f7 100644 --- a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RuleUnitContainerQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RuleUnitContainerQuarkusTemplate.java @@ -26,10 +26,10 @@ import org.kie.kogito.rules.RuleEventListenerConfig; import org.kie.kogito.app.Application; -@javax.enterprise.context.ApplicationScoped +@jakarta.enterprise.context.ApplicationScoped public class RuleUnits extends org.kie.kogito.drools.core.unit.AbstractRuleUnits implements org.kie.kogito.rules.RuleUnits { - @javax.inject.Inject + @jakarta.inject.Inject Application application; @Override diff --git a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/pom.xml b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/pom.xml index 68957d271c3..5b75e611d92 100644 --- a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/pom.xml +++ b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-codegen-sample - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 kogito-codegen-sample-generator diff --git a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleContainerQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleContainerQuarkusTemplate.java index 608f34f8289..5d46d09e07e 100644 --- a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleContainerQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleContainerQuarkusTemplate.java @@ -19,17 +19,17 @@ import java.util.HashMap; import java.util.Map; -@javax.enterprise.context.ApplicationScoped() +@jakarta.enterprise.context.ApplicationScoped() public class SampleRuntime extends org.kie.kogito.codegen.sample.core.SampleRuntimeImpl { - @javax.inject.Inject + @jakarta.inject.Inject protected org.kie.kogito.Application application; public SampleRuntime() { super(); } - @javax.annotation.PostConstruct + @jakarta.annotation.PostConstruct protected void init() { initApplication(application); initContent(); diff --git a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceQuarkusTemplate.java index db3893ba00e..4b473716ba2 100644 --- a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceQuarkusTemplate.java @@ -18,11 +18,11 @@ */ package org.kie.dmn.kogito.quarkus.example; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.kie.kogito.codegen.sample.core.SampleRuntime; import org.kie.kogito.dmn.rest.DMNEvaluationErrorException; diff --git a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceSpringTemplate.java b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceSpringTemplate.java index ddc3ab07681..9fc374e8ca8 100644 --- a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceSpringTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceSpringTemplate.java @@ -18,7 +18,7 @@ */ package org.kie.dmn.kogito.quarkus.example; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.kie.kogito.Application; import org.kie.kogito.codegen.sample.core.SampleRuntime; diff --git a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/config/SampleConfigQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/config/SampleConfigQuarkusTemplate.java index df267635006..82a7758afb2 100644 --- a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/config/SampleConfigQuarkusTemplate.java +++ b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/config/SampleConfigQuarkusTemplate.java @@ -18,7 +18,7 @@ */ import org.eclipse.microprofile.config.inject.ConfigProperty; -@javax.inject.Singleton +@jakarta.inject.Singleton public class SampleConfig extends org.kie.kogito.codegen.sample.core.SampleConfigImpl { public SampleConfig( diff --git a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-runtime/pom.xml b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-runtime/pom.xml index 291ae57619b..8fe2c2c6fa2 100644 --- a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-runtime/pom.xml +++ b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-runtime/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-codegen-sample - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 kogito-codegen-sample-runtime diff --git a/kogito-codegen-modules/kogito-codegen-sample/pom.xml b/kogito-codegen-modules/kogito-codegen-sample/pom.xml index 19d71ab9981..7e0c4957346 100644 --- a/kogito-codegen-modules/kogito-codegen-sample/pom.xml +++ b/kogito-codegen-modules/kogito-codegen-sample/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-codegen-modules - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-codegen-sample diff --git a/kogito-codegen-modules/pom.xml b/kogito-codegen-modules/pom.xml index 453a252c78f..f1d3896442f 100644 --- a/kogito-codegen-modules/pom.xml +++ b/kogito-codegen-modules/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-build-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../kogito-build/kogito-build-parent/pom.xml diff --git a/kogito-maven-plugin/pom.xml b/kogito-maven-plugin/pom.xml index 43cf9f0fde0..303030a7934 100644 --- a/kogito-maven-plugin/pom.xml +++ b/kogito-maven-plugin/pom.xml @@ -27,7 +27,7 @@ org.kie.kogito kogito-build-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../kogito-build/kogito-build-parent/pom.xml diff --git a/kogito-serverless-workflow/kogito-jq-expression/pom.xml b/kogito-serverless-workflow/kogito-jq-expression/pom.xml index a392a0aa22b..b3646698f30 100644 --- a/kogito-serverless-workflow/kogito-jq-expression/pom.xml +++ b/kogito-serverless-workflow/kogito-jq-expression/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-jq-expression diff --git a/kogito-serverless-workflow/kogito-jsonpath-expression/pom.xml b/kogito-serverless-workflow/kogito-jsonpath-expression/pom.xml index 0f0e67a4450..50b3c17f0d4 100644 --- a/kogito-serverless-workflow/kogito-jsonpath-expression/pom.xml +++ b/kogito-serverless-workflow/kogito-jsonpath-expression/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-jsonpath-expression diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-builder/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-builder/pom.xml index 16c727ea06c..f1981e04ce4 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-builder/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-builder/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-builder diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-executor-core/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-executor-core/pom.xml index ddb5b0d2ed1..f1bd56ebaae 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-executor-core/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-executor-core/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-executor-core diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-executor-grpc/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-executor-grpc/pom.xml index 11203244369..ef7164a6a9b 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-executor-grpc/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-executor-grpc/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-executor-grpc diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-executor-kafka/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-executor-kafka/pom.xml index 398b1a2b7fe..8efb37be5f1 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-executor-kafka/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-executor-kafka/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-executor-kafka diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/pom.xml index 49fdb390b99..87322dc42e5 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-executor-python @@ -85,6 +85,20 @@ + + jep + generate-resources + + exec + + + pip + + install + jep==4.2.0 + + + diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/requirements.txt b/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/requirements.txt index 8e77e5e3523..8434f46c6a1 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/requirements.txt +++ b/kogito-serverless-workflow/kogito-serverless-workflow-executor-python/requirements.txt @@ -1,2 +1 @@ -numpy>=1.21.0 -jep>=4.1.1 \ No newline at end of file +numpy>=1.21.0 \ No newline at end of file diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-executor-rest/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-executor-rest/pom.xml index cd36f2c9985..e3dd187600c 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-executor-rest/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-executor-rest/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-executor-rest diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-executor-service/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-executor-service/pom.xml index 816a56f6115..061dd129b47 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-executor-service/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-executor-service/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-executor-service diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-executor-tests/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-executor-tests/pom.xml index e189c402de3..67cf72b07a8 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-executor-tests/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-executor-tests/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-executor-tests diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-executor/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-executor/pom.xml index 8a01702e02b..03be40a31f4 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-executor/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-executor/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-executor diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-fluent/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-fluent/pom.xml index 904933123fc..dee74c113f5 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-fluent/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-fluent/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-fluent diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-grpc-parser/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-grpc-parser/pom.xml index 75bb576b005..d731f337ec1 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-grpc-parser/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-grpc-parser/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-grpc-parser diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-grpc-runtime/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-grpc-runtime/pom.xml index 0413bc3eb23..33fd9f984b4 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-grpc-runtime/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-grpc-runtime/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-grpc-runtime diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-openapi-common/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-openapi-common/pom.xml index 1756d1c9f3c..92880196945 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-openapi-common/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-openapi-common/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-openapi-common diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-openapi-generated/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-openapi-generated/pom.xml index a6425a07c82..8d199688d1c 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-openapi-generated/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-openapi-generated/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-openapi-generated diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-openapi-parser/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-openapi-parser/pom.xml index ed11f4e694c..831a12e6d3a 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-openapi-parser/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-openapi-parser/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-openapi-parser diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-openapi-parser/src/test/java/org/kie/kogito/serverless/workflow/CallbackStateServerlessWorkflowParsingTest.java b/kogito-serverless-workflow/kogito-serverless-workflow-openapi-parser/src/test/java/org/kie/kogito/serverless/workflow/CallbackStateServerlessWorkflowParsingTest.java index cdff4ce92cd..ff3917a7b2f 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-openapi-parser/src/test/java/org/kie/kogito/serverless/workflow/CallbackStateServerlessWorkflowParsingTest.java +++ b/kogito-serverless-workflow/kogito-serverless-workflow-openapi-parser/src/test/java/org/kie/kogito/serverless/workflow/CallbackStateServerlessWorkflowParsingTest.java @@ -136,9 +136,7 @@ private void assertCallbackProcessMainStructure(RuleFlowProcess process) { assertHasName(processFinalizeSuccessfulState, "FinalizeSuccessful"); ActionNode processFinalizeWithErrorState = assertClassAndGetNode(process, 6, ActionNode.class); assertHasName(processFinalizeWithErrorState, "FinalizeWithError"); - BoundaryEventNode callbackStateErrorBoundaryEvent = assertClassAndGetNode(process, 4, BoundaryEventNode.class); - assertHasName(callbackStateErrorBoundaryEvent, "Error-CallbackState-java.lang.Exception"); - + assertClassAndGetNode(process, 4, BoundaryEventNode.class); assertIsConnected(processStartNode, callbackState); assertIsConnected(callbackState, processFinalizeSuccessfulState); assertIsConnected(processFinalizeSuccessfulState, processEndNode1); diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-openapi-parser/src/test/resources/exec/callback-state-timeouts.sw.json b/kogito-serverless-workflow/kogito-serverless-workflow-openapi-parser/src/test/resources/exec/callback-state-timeouts.sw.json index 7fa2e1cf1d0..d38a68d1b1f 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-openapi-parser/src/test/resources/exec/callback-state-timeouts.sw.json +++ b/kogito-serverless-workflow/kogito-serverless-workflow-openapi-parser/src/test/resources/exec/callback-state-timeouts.sw.json @@ -15,7 +15,7 @@ "errors": [ { "name": "callbackError", - "code": "java.lang.Exception" + "code": "java.io.IOException" } ], "functions": [ diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-python-runtime/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-python-runtime/pom.xml index 37bd9a7c68c..a70aed71d83 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-python-runtime/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-python-runtime/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-python-runtime diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-rest-parser/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-rest-parser/pom.xml index ed6bf9fedf1..a09ace1b650 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-rest-parser/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-rest-parser/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-rest-parser diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-rest-runtime/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-rest-runtime/pom.xml index 3eec59091d1..4b80b5726b9 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-rest-runtime/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-rest-runtime/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-rest-runtime diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-runtime/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-runtime/pom.xml index 9125c4bdb6b..7d517284e51 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-runtime/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-runtime/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-runtime diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-utils/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-utils/pom.xml index ce9703f84ba..c5600b86913 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-utils/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-utils/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-serverless-workflow - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-serverless-workflow-utils diff --git a/kogito-serverless-workflow/pom.xml b/kogito-serverless-workflow/pom.xml index 0a9f00d1853..0ad75dfd15d 100644 --- a/kogito-serverless-workflow/pom.xml +++ b/kogito-serverless-workflow/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-build-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../kogito-build/kogito-build-parent/pom.xml diff --git a/kogito-test-utils/pom.xml b/kogito-test-utils/pom.xml index 645dba2e85e..5d148ce6184 100644 --- a/kogito-test-utils/pom.xml +++ b/kogito-test-utils/pom.xml @@ -27,7 +27,7 @@ org.kie.kogito kogito-build-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../kogito-build/kogito-build-parent/pom.xml diff --git a/kogito-workitems/kogito-jackson-utils/pom.xml b/kogito-workitems/kogito-jackson-utils/pom.xml index 15ea77f97be..862d3b0274e 100644 --- a/kogito-workitems/kogito-jackson-utils/pom.xml +++ b/kogito-workitems/kogito-jackson-utils/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-workitems - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-jackson-utils diff --git a/kogito-workitems/kogito-rest-utils/pom.xml b/kogito-workitems/kogito-rest-utils/pom.xml index 257a03d0dab..082acdb76a7 100644 --- a/kogito-workitems/kogito-rest-utils/pom.xml +++ b/kogito-workitems/kogito-rest-utils/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-workitems - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-rest-utils diff --git a/kogito-workitems/kogito-rest-workitem/pom.xml b/kogito-workitems/kogito-rest-workitem/pom.xml index f2fdf28a034..fa16bafe13c 100644 --- a/kogito-workitems/kogito-rest-workitem/pom.xml +++ b/kogito-workitems/kogito-rest-workitem/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-workitems - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-rest-workitem diff --git a/kogito-workitems/pom.xml b/kogito-workitems/pom.xml index edec80b31e2..e889ec3f9ed 100644 --- a/kogito-workitems/pom.xml +++ b/kogito-workitems/pom.xml @@ -23,7 +23,7 @@ org.kie.kogito kogito-build-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../kogito-build/kogito-build-parent/pom.xml kogito-workitems diff --git a/pom.xml b/pom.xml index 88e1eaaf5c9..317c4236534 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 4.0.0 org.kie.kogito kogito-runtimes - 2.0.0-SNAPSHOT + 999-SNAPSHOT pom Kogito Runtimes diff --git a/quarkus/addons/camel/deployment/pom.xml b/quarkus/addons/camel/deployment/pom.xml index ef3e397e3d8..d2d49c9c9b2 100644 --- a/quarkus/addons/camel/deployment/pom.xml +++ b/quarkus/addons/camel/deployment/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-camel-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/addons/camel/integration-tests/pom.xml b/quarkus/addons/camel/integration-tests/pom.xml index 26de448d975..3ec356e4346 100644 --- a/quarkus/addons/camel/integration-tests/pom.xml +++ b/quarkus/addons/camel/integration-tests/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-camel-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/addons/camel/pom.xml b/quarkus/addons/camel/pom.xml index 2e388da2e26..a74bb233108 100644 --- a/quarkus/addons/camel/pom.xml +++ b/quarkus/addons/camel/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/addons/camel/runtime/pom.xml b/quarkus/addons/camel/runtime/pom.xml index 18214c415cc..f528d8de0cf 100644 --- a/quarkus/addons/camel/runtime/pom.xml +++ b/quarkus/addons/camel/runtime/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-camel-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java index 55a94a42ae1..e61efe10e3c 100644 --- a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java +++ b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java @@ -21,11 +21,6 @@ import java.util.Collections; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.kie.kogito.internal.process.runtime.KogitoWorkItem; @@ -36,6 +31,11 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + import static org.kie.kogito.addons.quarkus.camel.runtime.CamelConstants.BODY; import static org.kie.kogito.addons.quarkus.camel.runtime.CamelConstants.HEADERS; diff --git a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java index 92e74b341ee..c5b11187cc9 100644 --- a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java +++ b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java @@ -18,12 +18,12 @@ */ package org.kie.kogito.addons.quarkus.camel.runtime; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.kie.kogito.process.impl.CachedWorkItemHandlerConfig; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped public class CamelCustomWorkItemHandlerConfig extends CachedWorkItemHandlerConfig { diff --git a/quarkus/addons/common/deployment/pom.xml b/quarkus/addons/common/deployment/pom.xml index 80014f7000a..f453b0f6f9c 100644 --- a/quarkus/addons/common/deployment/pom.xml +++ b/quarkus/addons/common/deployment/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-common-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/addons/common/pom.xml b/quarkus/addons/common/pom.xml index 6bf096b6f25..2b730a748a0 100644 --- a/quarkus/addons/common/pom.xml +++ b/quarkus/addons/common/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/addons/common/reactive-messaging/pom.xml b/quarkus/addons/common/reactive-messaging/pom.xml index 9d48f6df6de..b49293c7a68 100644 --- a/quarkus/addons/common/reactive-messaging/pom.xml +++ b/quarkus/addons/common/reactive-messaging/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-common-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java index fd6a0d07b4d..c8b6ddb9ed2 100644 --- a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java +++ b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java @@ -21,13 +21,13 @@ import java.util.Collection; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import org.eclipse.microprofile.reactive.messaging.Message; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; + /** * Provides a {@link MessageDecorator} instance. Ideally should not be used outside the {@link MessageFactory}. */ diff --git a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java index 4ff805195c2..2aed1745489 100644 --- a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java +++ b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java @@ -18,13 +18,13 @@ */ package org.kie.kogito.addon.quarkus.common.reactive.messaging.http; -import javax.ws.rs.core.HttpHeaders; - import org.eclipse.microprofile.reactive.messaging.Message; import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecorator; import io.quarkus.reactivemessaging.http.runtime.OutgoingHttpMetadata; +import jakarta.ws.rs.core.HttpHeaders; + /** * Decorators for Http CloudEvents outgoing messages */ diff --git a/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java b/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java index 72b4d3200a6..acc435f7f45 100644 --- a/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java +++ b/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java @@ -21,9 +21,6 @@ import java.util.Collections; import java.util.Optional; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; - import org.eclipse.microprofile.reactive.messaging.Message; import org.junit.jupiter.api.Test; import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecoratorProvider; @@ -32,6 +29,9 @@ import io.quarkus.reactivemessaging.http.runtime.OutgoingHttpMetadata; import io.quarkus.test.junit.QuarkusTest; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; + import static org.assertj.core.api.Assertions.assertThat; @QuarkusTest diff --git a/quarkus/addons/events/decisions/deployment/pom.xml b/quarkus/addons/events/decisions/deployment/pom.xml index 8c77207fe03..3af0d345f17 100644 --- a/quarkus/addons/events/decisions/deployment/pom.xml +++ b/quarkus/addons/events/decisions/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-events-decisions-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-events-decisions-deployment Kogito Add-On Events Decisions - Deployment diff --git a/quarkus/addons/events/decisions/pom.xml b/quarkus/addons/events/decisions/pom.xml index 81073b65d73..5eb0f548f9e 100644 --- a/quarkus/addons/events/decisions/pom.xml +++ b/quarkus/addons/events/decisions/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-events-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-events-decisions-parent diff --git a/quarkus/addons/events/decisions/runtime/pom.xml b/quarkus/addons/events/decisions/runtime/pom.xml index f4258b1d325..2060ca7fc59 100644 --- a/quarkus/addons/events/decisions/runtime/pom.xml +++ b/quarkus/addons/events/decisions/runtime/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-events-decisions-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-events-decisions @@ -51,7 +51,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java b/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java index e2a5255c055..fe73dbfcb49 100644 --- a/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java +++ b/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java @@ -18,9 +18,6 @@ */ package org.kie.kogito.eventdriven.decision; -import javax.annotation.PostConstruct; -import javax.inject.Inject; - import org.kie.kogito.config.ConfigBean; import org.kie.kogito.decision.DecisionModels; import org.kie.kogito.event.EventEmitter; @@ -28,6 +25,9 @@ import io.quarkus.runtime.Startup; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; + @Startup public class QuarkusEventDrivenDecisionController extends EventDrivenDecisionController { diff --git a/quarkus/addons/events/decisions/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/events/decisions/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 97c69b25eb8..28a17c006b6 100644 --- a/quarkus/addons/events/decisions/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/events/decisions/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -25,6 +25,6 @@ metadata: - decisions - DMN - Kafka - guide: https://quarkus.io/version/2.13/guides/kogito-dmn + guide: https://quarkus.io/guides/kogito-dmn categories: - "business-automation" diff --git a/quarkus/addons/events/mongodb/deployment/pom.xml b/quarkus/addons/events/mongodb/deployment/pom.xml index 084e971c7f9..294bc7d59ef 100644 --- a/quarkus/addons/events/mongodb/deployment/pom.xml +++ b/quarkus/addons/events/mongodb/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-events-mongodb-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-events-mongodb-deployment Kogito Add-On Events MongoDB - Deployment diff --git a/quarkus/addons/events/mongodb/pom.xml b/quarkus/addons/events/mongodb/pom.xml index 31ead4f989e..eb2a8d9a663 100644 --- a/quarkus/addons/events/mongodb/pom.xml +++ b/quarkus/addons/events/mongodb/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-events-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-events-mongodb-parent diff --git a/quarkus/addons/events/mongodb/runtime/pom.xml b/quarkus/addons/events/mongodb/runtime/pom.xml index 031919c65e9..bf3a3bb826c 100644 --- a/quarkus/addons/events/mongodb/runtime/pom.xml +++ b/quarkus/addons/events/mongodb/runtime/pom.xml @@ -27,7 +27,7 @@ org.kie.kogito kogito-addons-quarkus-events-mongodb-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-events-mongodb @@ -44,8 +44,8 @@ quarkus-mongodb-client - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api org.eclipse.microprofile.config @@ -76,7 +76,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin @@ -89,7 +89,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java b/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java index acc045bf570..26a0cb61995 100644 --- a/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java +++ b/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java @@ -18,15 +18,15 @@ */ package org.kie.kogito.events.mongodb; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.mongodb.transaction.AbstractTransactionManager; import com.mongodb.client.MongoClient; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @Singleton public class QuarkusMongoDBEventPublisher extends MongoDBEventPublisher { diff --git a/quarkus/addons/events/mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/events/mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 5b6f1751d3a..1f442efbb8b 100644 --- a/quarkus/addons/events/mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/events/mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -26,6 +26,6 @@ metadata: - mongodb - events - process - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java index ad167e71660..2889353a58b 100644 --- a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java +++ b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java @@ -20,8 +20,6 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; - import org.bson.Document; import org.bson.conversions.Bson; @@ -37,6 +35,8 @@ import io.quarkus.test.Mock; +import jakarta.enterprise.context.ApplicationScoped; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java index e00cebbfce2..308a8ad6ee0 100644 --- a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java +++ b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java @@ -18,14 +18,14 @@ */ package org.kie.kogito.events.mongodb; -import javax.enterprise.context.ApplicationScoped; - import org.kie.kogito.mongodb.transaction.AbstractTransactionManager; import com.mongodb.client.ClientSession; import io.quarkus.test.Mock; +import jakarta.enterprise.context.ApplicationScoped; + @Mock @ApplicationScoped public class MockTransactionManager extends AbstractTransactionManager { diff --git a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java index 9d95cf44664..b511659be11 100644 --- a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java +++ b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java @@ -18,8 +18,6 @@ */ package org.kie.kogito.events.mongodb; -import javax.inject.Inject; - import org.junit.jupiter.api.Test; import org.kie.kogito.mongodb.transaction.AbstractTransactionManager; @@ -28,6 +26,8 @@ import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectSpy; +import jakarta.inject.Inject; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.mockito.ArgumentMatchers.eq; diff --git a/quarkus/addons/events/pom.xml b/quarkus/addons/events/pom.xml index 709a554b062..0ee68e37e94 100644 --- a/quarkus/addons/events/pom.xml +++ b/quarkus/addons/events/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/addons/events/predictions/deployment/pom.xml b/quarkus/addons/events/predictions/deployment/pom.xml index a30d7ab8929..22ebe37d837 100644 --- a/quarkus/addons/events/predictions/deployment/pom.xml +++ b/quarkus/addons/events/predictions/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-events-predictions-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-events-predictions-deployment Kogito Add-On Events Predictions - Deployment diff --git a/quarkus/addons/events/predictions/pom.xml b/quarkus/addons/events/predictions/pom.xml index 21cdc604f74..18cc7a59ca5 100644 --- a/quarkus/addons/events/predictions/pom.xml +++ b/quarkus/addons/events/predictions/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-events-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-events-predictions-parent diff --git a/quarkus/addons/events/predictions/runtime/pom.xml b/quarkus/addons/events/predictions/runtime/pom.xml index f74c628f89e..1f773c32a6c 100644 --- a/quarkus/addons/events/predictions/runtime/pom.xml +++ b/quarkus/addons/events/predictions/runtime/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-events-predictions-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-events-predictions @@ -51,7 +51,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java b/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java index b1b9b3849b9..33ee21e7028 100644 --- a/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java +++ b/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java @@ -18,9 +18,6 @@ */ package org.kie.kogito.eventdriven.predictions; -import javax.annotation.PostConstruct; -import javax.inject.Inject; - import org.kie.kogito.config.ConfigBean; import org.kie.kogito.event.EventEmitter; import org.kie.kogito.event.EventReceiver; @@ -28,6 +25,9 @@ import io.quarkus.runtime.Startup; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; + @Startup public class QuarkusEventDrivenPredictionsController extends EventDrivenPredictionsController { diff --git a/quarkus/addons/events/predictions/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/events/predictions/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 8a988af040c..fac44beefac 100644 --- a/quarkus/addons/events/predictions/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/events/predictions/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -25,6 +25,6 @@ metadata: - predictions - PMML - Kafka - guide: https://quarkus.io/version/2.13/guides/kogito-pmml + guide: https://quarkus.io/guides/kogito-pmml categories: - "business-automation" diff --git a/quarkus/addons/events/process/deployment/pom.xml b/quarkus/addons/events/process/deployment/pom.xml index d09dcf06787..b27d8b65b37 100644 --- a/quarkus/addons/events/process/deployment/pom.xml +++ b/quarkus/addons/events/process/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-events-process-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-events-process-deployment Kogito Add-On Events Process - Deployment diff --git a/quarkus/addons/events/process/pom.xml b/quarkus/addons/events/process/pom.xml index b49e3581d56..11273f500f2 100644 --- a/quarkus/addons/events/process/pom.xml +++ b/quarkus/addons/events/process/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-events-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-events-process-parent diff --git a/quarkus/addons/events/process/runtime/pom.xml b/quarkus/addons/events/process/runtime/pom.xml index 6f566021afd..66bcf75b075 100644 --- a/quarkus/addons/events/process/runtime/pom.xml +++ b/quarkus/addons/events/process/runtime/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-events-process-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-events-process Kogito Add-On Events Process @@ -45,8 +45,8 @@ kogito-addons-quarkus-common-reactive-messaging - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api provided @@ -79,7 +79,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin @@ -92,7 +92,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/config/EventsRuntimeConfig.java b/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/config/EventsRuntimeConfig.java index 5e78b3de9b9..18368bcd545 100644 --- a/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/config/EventsRuntimeConfig.java +++ b/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/config/EventsRuntimeConfig.java @@ -22,7 +22,7 @@ import io.quarkus.runtime.annotations.ConfigPhase; import io.quarkus.runtime.annotations.ConfigRoot; -@ConfigRoot(name = "kogito", phase = ConfigPhase.RUN_TIME, prefix = "events") +@ConfigRoot(prefix = "kogito", name = "events", phase = ConfigPhase.RUN_TIME) public class EventsRuntimeConfig { /** diff --git a/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java b/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java index 225f55eb4e1..1b2b56ada1e 100644 --- a/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java +++ b/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java @@ -22,11 +22,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.annotation.PostConstruct; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Message; import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecoratorProvider; @@ -41,6 +36,11 @@ import io.smallrye.reactive.messaging.MutinyEmitter; import io.smallrye.reactive.messaging.providers.locals.ContextAwareMessage; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @Singleton public class ReactiveMessagingEventPublisher implements EventPublisher { diff --git a/quarkus/addons/events/process/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/events/process/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 1a5dc806739..d6ef5999d94 100644 --- a/quarkus/addons/events/process/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/events/process/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -26,6 +26,6 @@ metadata: - process - events # TODO: add process guide - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/events/rules/deployment/pom.xml b/quarkus/addons/events/rules/deployment/pom.xml index 848564c29c5..8f7e1ffe7b3 100644 --- a/quarkus/addons/events/rules/deployment/pom.xml +++ b/quarkus/addons/events/rules/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-events-rules-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-events-rules-deployment Kogito Add-On Events Rules - Deployment diff --git a/quarkus/addons/events/rules/pom.xml b/quarkus/addons/events/rules/pom.xml index 8e8ad8acecd..3ad5151a82c 100644 --- a/quarkus/addons/events/rules/pom.xml +++ b/quarkus/addons/events/rules/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-events-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-events-rules-parent diff --git a/quarkus/addons/events/rules/runtime/pom.xml b/quarkus/addons/events/rules/runtime/pom.xml index 756fb2d4dd5..d96d973c1af 100644 --- a/quarkus/addons/events/rules/runtime/pom.xml +++ b/quarkus/addons/events/rules/runtime/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-events-rules-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-events-rules @@ -51,7 +51,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java b/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java index 4b34ff5589e..ddc89462641 100644 --- a/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java +++ b/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java @@ -18,15 +18,15 @@ */ package org.kie.kogito.eventdriven.rules; -import javax.annotation.PostConstruct; -import javax.inject.Inject; - import org.kie.kogito.config.ConfigBean; import org.kie.kogito.event.EventEmitter; import org.kie.kogito.event.EventReceiver; import io.quarkus.runtime.Startup; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; + @Startup public class QuarkusEventDrivenRulesController extends EventDrivenRulesController { diff --git a/quarkus/addons/events/rules/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/events/rules/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 3b47a52bdbc..65aafaa29ba 100644 --- a/quarkus/addons/events/rules/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/events/rules/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -26,6 +26,6 @@ metadata: - drools - DRL - Kafka - guide: https://quarkus.io/version/2.13/guides/kogito-drl + guide: https://quarkus.io/guides/kogito-drl categories: - "business-automation" diff --git a/quarkus/addons/explainability/deployment/pom.xml b/quarkus/addons/explainability/deployment/pom.xml index c66b5b9b2ce..3350350a11b 100644 --- a/quarkus/addons/explainability/deployment/pom.xml +++ b/quarkus/addons/explainability/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-explainability-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-explainability-deployment Kogito Add-On Explainability - Deployment diff --git a/quarkus/addons/explainability/integration-tests/pom.xml b/quarkus/addons/explainability/integration-tests/pom.xml index 9e8e0c526d2..b4f93c5579e 100644 --- a/quarkus/addons/explainability/integration-tests/pom.xml +++ b/quarkus/addons/explainability/integration-tests/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-explainability-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-explainability-it Kogito Add-On Explainability - Integration tests diff --git a/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java b/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java index c8e17b2846a..d5366c6faa5 100644 --- a/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java +++ b/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java @@ -22,9 +22,6 @@ import java.util.List; import java.util.Map; -import javax.inject.Singleton; -import javax.ws.rs.core.Response; - import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; import org.kie.kogito.config.ConfigBean; @@ -36,6 +33,9 @@ import io.restassured.common.mapper.TypeRef; import io.restassured.http.ContentType; +import jakarta.inject.Singleton; +import jakarta.ws.rs.core.Response; + import static io.restassured.RestAssured.given; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/quarkus/addons/explainability/pom.xml b/quarkus/addons/explainability/pom.xml index b08e3d3a810..bf9e725513b 100644 --- a/quarkus/addons/explainability/pom.xml +++ b/quarkus/addons/explainability/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-explainability-parent diff --git a/quarkus/addons/explainability/runtime/pom.xml b/quarkus/addons/explainability/runtime/pom.xml index 703f894e52a..01b67c7df92 100644 --- a/quarkus/addons/explainability/runtime/pom.xml +++ b/quarkus/addons/explainability/runtime/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-explainability-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -85,7 +85,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java b/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java index ae72a325814..94baff9a475 100644 --- a/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java +++ b/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java @@ -20,19 +20,19 @@ import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import org.kie.kogito.Application; import org.kie.kogito.explainability.model.PredictInput; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + @Path("/predict") public class QuarkusExplainableResource { diff --git a/quarkus/addons/explainability/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/explainability/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 754324e79b2..daa4d382388 100644 --- a/quarkus/addons/explainability/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/explainability/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -25,7 +25,7 @@ metadata: - decisions - dmn - explainability - guide: https://quarkus.io/version/2.13/guides/kogito-dmn + guide: https://quarkus.io/guides/kogito-dmn categories: - "business-automation" unlisted: true diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/deployment/pom.xml b/quarkus/addons/fabric8-kubernetes-service-catalog/deployment/pom.xml index 6cb9ccd0575..1cc5a2cf6cd 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/deployment/pom.xml +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/deployment/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-fabric8-kubernetes-service-catalog-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-fabric8-kubernetes-service-catalog-deployment diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/pom.xml b/quarkus/addons/fabric8-kubernetes-service-catalog/pom.xml index 3ec90f0369c..f15b61e2abb 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/pom.xml +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-fabric8-kubernetes-service-catalog-parent diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml index 55d400e4400..6f0a838703e 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-fabric8-kubernetes-service-catalog-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-fabric8-kubernetes-service-catalog @@ -97,7 +97,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java index 5aba7abd79a..37fbdfe3b1a 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java @@ -24,12 +24,12 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog; import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalogKey; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped final class Fabric8KubernetesServiceCatalog implements KubernetesServiceCatalog { diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java index 104e80d302b..6998e84b6fe 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java @@ -18,13 +18,13 @@ */ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; - import io.fabric8.knative.client.KnativeClient; import io.fabric8.kubernetes.client.KubernetesClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; + final class KnativeClientProducer { private final KubernetesClient kubernetesClient; diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java index dd818d9c9bb..9bb8515bf2e 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java @@ -21,15 +21,15 @@ import java.net.URI; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import io.fabric8.knative.client.KnativeClient; import io.fabric8.knative.serving.v1.Service; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped class KnativeServiceDiscovery extends AbstractResourceDiscovery { diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java index 2900f610eb0..5a21b1cff07 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java @@ -22,14 +22,14 @@ import java.util.Optional; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import io.fabric8.kubernetes.client.KubernetesClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped class KubernetesResourceDiscovery extends AbstractResourceDiscovery { diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java index 4299a6bd556..d93acaa473f 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java @@ -23,9 +23,6 @@ import java.util.Optional; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,6 +30,9 @@ import io.fabric8.openshift.api.model.Route; import io.fabric8.openshift.client.OpenShiftClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped class OpenShiftResourceDiscovery extends AbstractResourceDiscovery { diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java index b895f673625..a3d2707ee7b 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java @@ -21,8 +21,6 @@ import java.net.URI; import java.util.Optional; -import javax.inject.Inject; - import org.junit.jupiter.api.Test; import io.fabric8.kubernetes.api.model.ContainerPortBuilder; @@ -37,6 +35,8 @@ import io.quarkus.test.kubernetes.client.KubernetesTestServer; import io.quarkus.test.kubernetes.client.WithKubernetesTestServer; +import jakarta.inject.Inject; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -59,7 +59,7 @@ public class DeploymentUtilsTest { @Test public void testNotFoundDeployment() { Deployment deployment = mockServer.getClient().apps().deployments().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment.yaml")).item(); deployment.getMetadata().setName("test"); mockServer.getClient().resource(deployment).inNamespace(namespace).createOrReplace(); assertEquals(Optional.empty(), @@ -71,11 +71,11 @@ public void testDeploymentWithService() { var kubeURI = KubernetesResourceUri.parse("deployments.v1.apps/" + namespace + "/example-deployment-with-service"); Deployment deployment = mockServer.getClient().apps().deployments().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment.yaml")).item(); mockServer.getClient().resource(deployment).inNamespace(namespace).createOrReplace(); Service service = mockServer.getClient().services().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-service.yaml")).item(); mockServer.getClient().resource(service).inNamespace(namespace).createOrReplace(); Optional url = discovery.query(kubeURI).map(URI::toString); @@ -87,14 +87,14 @@ public void testDeploymentWithServiceWithCustomPortName() { var kubeURI = KubernetesResourceUri.parse("deployments.v1.apps/" + namespace + "/custom-port-deployment?port-name=my-custom-port"); Deployment deployment = mockServer.getClient().apps().deployments().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment.yaml")).item(); deployment.getMetadata().setName("custom-port-deployment"); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts() .add(new ContainerPortBuilder().withName("test-port").withContainerPort(4000).build()); mockServer.getClient().resource(deployment).inNamespace(namespace).createOrReplace(); Service service = mockServer.getClient().services().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-service.yaml")).item(); service.getMetadata().setName("custom-port-name-service"); service.getSpec().getPorts().add(new ServicePortBuilder() .withName("my-custom-port") @@ -111,16 +111,16 @@ public void testDeploymentNoService() { var kubeURI = KubernetesResourceUri.parse("deployments.v1.apps/" + namespace + "/example-deployment-no-service"); Deployment deployment = mockServer.getClient().apps().deployments().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-no-service.yaml")).item(); Deployment createdDeployment = mockServer.getClient().resource(deployment).inNamespace(namespace).createOrReplace(); ReplicaSet rs = mockServer.getClient().apps().replicaSets().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deployment/replica-set-deployment-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deployment/replica-set-deployment-no-service.yaml")).item(); rs.getMetadata().getOwnerReferences().get(0).setUid(createdDeployment.getMetadata().getUid()); ReplicaSet createdRs = mockServer.getClient().resource(rs).inNamespace(namespace).createOrReplace(); Pod pod = mockServer.getClient().pods().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deployment/pod-deployment-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deployment/pod-deployment-no-service.yaml")).item(); pod.getMetadata().setName("pod-deployment-no-service"); pod.getMetadata().getOwnerReferences().get(0).setUid(createdRs.getMetadata().getUid()); mockServer.getClient().resource(pod).inNamespace(namespace).createOrReplace(); @@ -134,19 +134,19 @@ public void testDeploymentNoService2Replicas() { var kubeURI = KubernetesResourceUri.parse("deployments.v1.apps/" + namespace + "/example-deployment-no-service-2-replicas"); Deployment deployment = mockServer.getClient().apps().deployments().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-no-service.yaml")).item(); deployment.getMetadata().setName("example-deployment-no-service-2-replicas"); deployment.getStatus().setReplicas(2); Deployment createdDeployment = mockServer.getClient().resource(deployment).inNamespace(namespace).createOrReplace(); ReplicaSet rs = mockServer.getClient().apps().replicaSets().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deployment/replica-set-deployment-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deployment/replica-set-deployment-no-service.yaml")).item(); rs.getMetadata().setName("rs-2-replicas"); rs.getMetadata().getOwnerReferences().get(0).setUid(createdDeployment.getMetadata().getUid()); ReplicaSet createdRs = mockServer.getClient().resource(rs).inNamespace(namespace).createOrReplace(); Pod pod = mockServer.getClient().pods().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deployment/pod-deployment-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deployment/pod-deployment-no-service.yaml")).item(); pod.getMetadata().setName("pod-2-replicas"); pod.getMetadata().getOwnerReferences().get(0).setUid(createdRs.getMetadata().getUid()); mockServer.getClient().resource(pod).inNamespace(namespace).createOrReplace(); @@ -160,20 +160,20 @@ public void testDeploymentNoServiceCustomPortName() { var kubeURI = KubernetesResourceUri.parse("deployments.v1.apps/" + namespace + "/custom-port-deployment-1?port-name=my-custom-port"); Deployment deployment = mockServer.getClient().apps().deployments().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-no-service.yaml")).item(); deployment.getMetadata().setName("custom-port-deployment-1"); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts() .add(new ContainerPortBuilder().withName("test-port").withContainerPort(4000).build()); Deployment createdDeployment = mockServer.getClient().resource(deployment).inNamespace(namespace).createOrReplace(); ReplicaSet rs = mockServer.getClient().apps().replicaSets().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deployment/replica-set-deployment-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deployment/replica-set-deployment-no-service.yaml")).item(); rs.getMetadata().setName("custom-port-rs"); rs.getMetadata().getOwnerReferences().get(0).setUid(createdDeployment.getMetadata().getUid()); ReplicaSet createdRs = mockServer.getClient().resource(rs).inNamespace(namespace).createOrReplace(); Pod pod = mockServer.getClient().pods().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deployment/pod-deployment-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deployment/pod-deployment-no-service.yaml")).item(); pod.getMetadata().getOwnerReferences().get(0).setUid(createdRs.getMetadata().getUid()); pod.getSpec().getContainers().get(0).getPorts() .add(new ContainerPortBuilder() diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java index e9ed6cb6db7..54bc48295f0 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java @@ -18,8 +18,6 @@ */ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog; -import javax.inject.Inject; - import org.junit.jupiter.api.BeforeEach; import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalogTest; @@ -28,6 +26,8 @@ import io.quarkus.test.kubernetes.client.KubernetesTestServer; import io.quarkus.test.kubernetes.client.WithKubernetesTestServer; +import jakarta.inject.Inject; + import static org.kie.kogito.addons.quarkus.k8s.test.utils.KnativeResourceDiscoveryTestUtil.createServiceIfNotExists; @QuarkusTest @@ -48,4 +48,4 @@ void beforeEach() { Fabric8KubernetesServiceCatalogTest(Fabric8KubernetesServiceCatalog fabric8KubernetesServiceCatalog) { super(fabric8KubernetesServiceCatalog); } -} \ No newline at end of file +} diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java index 8a2ed6392d7..7542569f576 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java @@ -21,8 +21,6 @@ import java.net.URI; import java.util.Optional; -import javax.inject.Inject; - import org.junit.jupiter.api.Test; import io.fabric8.kubernetes.api.model.networking.v1.Ingress; @@ -31,6 +29,8 @@ import io.quarkus.test.kubernetes.client.KubernetesTestServer; import io.quarkus.test.kubernetes.client.WithKubernetesTestServer; +import jakarta.inject.Inject; + import static org.junit.jupiter.api.Assertions.assertEquals; /** @@ -53,7 +53,7 @@ public void testIngressNotFound() { Ingress ingress = mockServer.getClient() .network().v1().ingresses() .inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("ingress/ingress-with-ip.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("ingress/ingress-with-ip.yaml")).item(); mockServer.getClient().resource(ingress).inNamespace(namespace).createOrReplace(); assertEquals(Optional.empty(), @@ -65,7 +65,7 @@ public void testIngressWithIP() { var kubeURI = KubernetesResourceUri.parse("ingresses.v1.networking.k8s.io/" + namespace + "/process-quarkus-ingress"); Ingress ingress = mockServer.getClient().network().v1().ingresses().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("ingress/ingress-with-ip.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("ingress/ingress-with-ip.yaml")).item(); mockServer.getClient().resource(ingress).inNamespace(namespace).createOrReplace(); @@ -78,7 +78,7 @@ public void testIngressWithTLS() { var kubeURI = KubernetesResourceUri.parse("ingresses.v1.networking.k8s.io/" + namespace + "/hello-app-ingress-tls"); Ingress ingress = mockServer.getClient().network().v1().ingresses().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("ingress/ingress-with-tls-and-host.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("ingress/ingress-with-tls-and-host.yaml")).item(); mockServer.getClient().resource(ingress).inNamespace(namespace).createOrReplace(); diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java index 0c6eb354522..c048fed5a3f 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java @@ -21,8 +21,6 @@ import java.net.URI; import java.util.Optional; -import javax.inject.Inject; - import org.junit.jupiter.api.Test; import org.kie.kogito.addons.quarkus.k8s.test.utils.KnativeResourceDiscoveryTestUtil; @@ -31,6 +29,8 @@ import io.quarkus.test.kubernetes.client.KubernetesTestServer; import io.quarkus.test.kubernetes.client.WithKubernetesTestServer; +import jakarta.inject.Inject; + import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @QuarkusTest diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java index b88566787ff..01f250e0b5e 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java @@ -21,8 +21,6 @@ import java.net.URI; import java.util.Optional; -import javax.inject.Inject; - import org.junit.jupiter.api.Test; import io.fabric8.knative.client.KnativeClient; @@ -32,6 +30,8 @@ import io.quarkus.test.kubernetes.client.KubernetesTestServer; import io.quarkus.test.kubernetes.client.WithKubernetesTestServer; +import jakarta.inject.Inject; + import static org.junit.jupiter.api.Assertions.assertEquals; /** @@ -54,7 +54,7 @@ public void testServiceNodePort() { var kubeURI = KubernetesResourceUri.parse("services.v1/" + namespace + "/process-quarkus-example-pod-service"); Service service = mockServer.getClient().services().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("service/service-node-port.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("service/service-node-port.yaml")).item(); mockServer.getClient().resource(service).inNamespace(namespace).createOrReplace(); @@ -67,7 +67,7 @@ public void testServiceNodePortCustomPortName() { var kubeURI = KubernetesResourceUri.parse("services.v1/" + namespace + "/custom-port-name-service?port-name=my-custom-port"); Service service = mockServer.getClient().services().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("service/service-node-port.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("service/service-node-port.yaml")).item(); service.getMetadata().setName("custom-port-name-service"); service.getSpec().getPorts().get(0).setName("my-custom-port"); service.getSpec().getPorts().get(0).setPort(8089); @@ -82,7 +82,7 @@ public void testServiceClusterIP() { var kubeURI = KubernetesResourceUri.parse("services.v1/" + namespace + "/process-quarkus-example-pod-clusterip-svc"); Service service = mockServer.getClient().services().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).item(); mockServer.getClient().resource(service).inNamespace(namespace).createOrReplace(); Optional url = kubernetesResourceDiscovery.query(kubeURI).map(URI::toString); @@ -94,7 +94,7 @@ public void testServiceExternalName() { var kubeURI = KubernetesResourceUri.parse("services.v1/" + namespace + "/process-quarkus-example-pod"); Service service = mockServer.getClient().services().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("service/service-external-name.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("service/service-external-name.yaml")).item(); mockServer.getClient().resource(service).inNamespace(namespace).createOrReplace(); Optional url = kubernetesResourceDiscovery.query(kubeURI).map(URI::toString); @@ -104,7 +104,7 @@ public void testServiceExternalName() { @Test public void testNotFoundService() { Service service = mockServer.getClient().services().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).item(); mockServer.getClient().resource(service).inNamespace(namespace).createOrReplace(); assertEquals(Optional.empty(), @@ -114,7 +114,7 @@ public void testNotFoundService() { @Test public void testNotSupportedTypeService() { Service service = mockServer.getClient().services().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).item(); service.getSpec().setType(KubeConstants.LOAD_BALANCER_TYPE); mockServer.getClient().resource(service).inNamespace(namespace).createOrReplace(); @@ -127,7 +127,7 @@ public void testServiceWithoutNamespace() { var kubeURI = KubernetesResourceUri.parse("services.v1/process-quarkus-example-pod-service"); Service service = mockServer.getClient().services().inNamespace("test") - .load(this.getClass().getClassLoader().getResourceAsStream("service/service-node-port.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("service/service-node-port.yaml")).item(); mockServer.getClient().resource(service).inNamespace("test").createOrReplace(); Optional url = kubernetesResourceDiscovery.query(kubeURI).map(URI::toString); @@ -138,7 +138,7 @@ public void testServiceWithoutNamespace() { public void testNotFoundKnativeService() { KnativeClient knativeClient = mockServer.getClient().adapt(KnativeClient.class); io.fabric8.knative.serving.v1.Service service = knativeClient.services().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("knative/quarkus-greeting.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("knative/quarkus-greeting.yaml")).item(); service.getMetadata().setName("test"); // ItemWritableOperation#create is deprecated. However, we can't use the new method while Quarkus LTS is not greater than 2.16. @@ -154,7 +154,7 @@ public void testKnativeService() { KnativeClient knativeClient = mockServer.getClient().adapt(KnativeClient.class); io.fabric8.knative.serving.v1.Service kService = knativeClient.services().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("knative/quarkus-greeting.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("knative/quarkus-greeting.yaml")).item(); // ItemWritableOperation#create is deprecated. However, we can't use the new method while Quarkus LTS is not greater than 2.16. knativeClient.services().inNamespace(namespace).create(kService); diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java index 960436dc1f4..e27d9107c0b 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java @@ -21,8 +21,6 @@ import java.net.URI; import java.util.Optional; -import javax.inject.Inject; - import org.junit.jupiter.api.Test; import io.fabric8.kubernetes.api.model.Pod; @@ -35,6 +33,8 @@ import io.quarkus.test.kubernetes.client.OpenShiftTestServer; import io.quarkus.test.kubernetes.client.WithOpenShiftTestServer; +import jakarta.inject.Inject; + import static org.junit.jupiter.api.Assertions.assertEquals; @QuarkusTest @@ -52,7 +52,7 @@ public class OpenShiftServiceDiscoveryTest { @Test public void testNotFoundDeploymentConfig() { DeploymentConfig deploymentConfig = mockServer.getOpenshiftClient().deploymentConfigs().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/deployment-config.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/deployment-config.yaml")).item(); deploymentConfig.getMetadata().setName("test"); mockServer.getOpenshiftClient().resource(deploymentConfig).inNamespace(namespace).createOrReplace(); assertEquals(Optional.empty(), @@ -66,13 +66,13 @@ public void testDeploymentConfigWithService() { DeploymentConfig deploymentConfig = mockServer.getOpenshiftClient() .deploymentConfigs() .inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/deployment-config.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/deployment-config.yaml")).item(); mockServer.getOpenshiftClient().resource(deploymentConfig).inNamespace(namespace).createOrReplace(); Service service = mockServer.getOpenshiftClient() .services() .inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/deployment-config-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/deployment-config-service.yaml")).item(); mockServer.getOpenshiftClient().resource(service).inNamespace(namespace).createOrReplace(); Optional url = kubeResourceDiscovery.query(kubeURI).map(URI::toString); @@ -86,20 +86,20 @@ public void testDeploymentConfigWithoutService() { DeploymentConfig deploymentConfig = mockServer.getOpenshiftClient() .deploymentConfigs() .inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/deployment-config-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/deployment-config-no-service.yaml")).item(); DeploymentConfig createdDc = mockServer.getOpenshiftClient().resource(deploymentConfig).inNamespace(namespace).createOrReplace(); ReplicationController rc = mockServer.getOpenshiftClient() .replicationControllers() .inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/replication-controller-dc-no-svc.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/replication-controller-dc-no-svc.yaml")).item(); rc.getMetadata().getOwnerReferences().get(0).setUid(createdDc.getMetadata().getUid()); ReplicationController createdRc = mockServer.getOpenshiftClient().resource(rc).inNamespace(namespace).createOrReplace(); Pod pod = mockServer.getOpenshiftClient() .pods() .inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/pod-deployment-config-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/pod-deployment-config-no-service.yaml")).item(); pod.getMetadata().setName("example-dc-no-service-1-phlx4"); pod.getMetadata().getOwnerReferences().get(0).setUid(createdRc.getMetadata().getUid()); mockServer.getOpenshiftClient().resource(pod).inNamespace(namespace).createOrReplace(); @@ -113,7 +113,7 @@ public void testNotFoundRoute() { Route route = mockServer.getOpenshiftClient() .routes() .inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("route/route.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("route/route.yaml")).item(); mockServer.getOpenshiftClient().resource(route).inNamespace(namespace).createOrReplace(); assertEquals(Optional.empty(), @@ -127,7 +127,7 @@ public void testRoute() { Route route = mockServer.getOpenshiftClient() .routes() .inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("route/route.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("route/route.yaml")).item(); mockServer.getOpenshiftClient().resource(route).inNamespace(namespace).createOrReplace(); Optional url = kubeResourceDiscovery.query(kubeURI).map(URI::toString); @@ -141,7 +141,7 @@ public void testRouteTLS() { Route route = mockServer.getOpenshiftClient() .routes() .inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("route/route-tls.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("route/route-tls.yaml")).item(); mockServer.getOpenshiftClient().resource(route).inNamespace(namespace).createOrReplace(); Optional url = kubeResourceDiscovery.query(kubeURI).map(URI::toString); diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java index 2a70e3dfd0a..bacdf675d0d 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java @@ -22,8 +22,6 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; - import org.junit.jupiter.api.Test; import io.fabric8.kubernetes.api.model.Pod; @@ -33,6 +31,8 @@ import io.quarkus.test.kubernetes.client.KubernetesTestServer; import io.quarkus.test.kubernetes.client.WithKubernetesTestServer; +import jakarta.inject.Inject; + import static org.junit.jupiter.api.Assertions.assertEquals; /** @@ -53,7 +53,7 @@ public class PodUtilsTest { @Test public void testPodNotFound() { Pod pod = mockServer.getClient().pods().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service.yaml")).item(); pod.getMetadata().setName("test-pod"); mockServer.getClient().resource(pod).inNamespace(namespace).createOrReplace(); assertEquals(Optional.empty(), @@ -65,7 +65,7 @@ public void testPodWithNoService() { var kubeURI = KubernetesResourceUri.parse("pods.v1/" + namespace + "/process-quarkus-example-pod-no-service"); Pod pod = mockServer.getClient().pods().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service.yaml")).item(); mockServer.getClient().resource(pod).inNamespace(namespace).createOrReplace(); Optional url = discovery.query(kubeURI).map(URI::toString); @@ -77,7 +77,7 @@ public void testPodWithNoServiceCustomPortName() { var kubeURI = KubernetesResourceUri.parse("pods.v1/" + namespace + "/pod-no-service-custom-port?port-name=my-custom-port"); Pod pod = mockServer.getClient().pods().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service-custom-port-name.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service-custom-port-name.yaml")).item(); mockServer.getClient().resource(pod).inNamespace(namespace).createOrReplace(); Optional url = discovery.query(kubeURI).map(URI::toString); @@ -89,12 +89,12 @@ public void testPodWithService() { var kubeURI = KubernetesResourceUri.parse("pods.v1/" + namespace + "/test-pod-with-service"); Pod pod = mockServer.getClient().pods().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service.yaml")).item(); pod.getMetadata().setName("test-pod-with-service"); mockServer.getClient().resource(pod).inNamespace(namespace).createOrReplace(); Service service = mockServer.getClient().services().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).item(); mockServer.getClient().resource(service).inNamespace(namespace).createOrReplace(); @@ -107,17 +107,17 @@ public void testPodWithServiceWithCustomLabel() { var kubeURI = KubernetesResourceUri.parse("pods.v1/" + namespace + "/test-pod-with-service-custom-label?labels=label-name=test-label;other-label=other-value"); Pod pod = mockServer.getClient().pods().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service.yaml")).item(); pod.getMetadata().setName("test-pod-with-service-custom-label"); mockServer.getClient().resource(pod).inNamespace(namespace).createOrReplace(); Service service = mockServer.getClient().services().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).item(); service.getMetadata().setName(" process-quarkus-example-pod-clusterip-svc-custom-label"); mockServer.getClient().resource(service).inNamespace(namespace).createOrReplace(); Service service1 = mockServer.getClient().services().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).item(); Map labels = service1.getMetadata().getLabels(); labels.put("label-name", "test-label"); service1.getMetadata().setLabels(labels); diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java index 525d840a448..c39d6eccbb3 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java @@ -21,8 +21,6 @@ import java.net.URI; import java.util.Optional; -import javax.inject.Inject; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -37,6 +35,8 @@ import io.quarkus.test.kubernetes.client.KubernetesTestServer; import io.quarkus.test.kubernetes.client.WithKubernetesTestServer; +import jakarta.inject.Inject; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -65,7 +65,7 @@ public void removeResources() { @Test public void testNotFoundStatefulSet() { StatefulSet statefulSet = mockServer.getClient().apps().statefulSets().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-no-service.yaml")).item(); statefulSet.getMetadata().setName("test"); mockServer.getClient().resource(statefulSet).inNamespace(namespace).createOrReplace(); assertEquals(Optional.empty(), @@ -77,11 +77,11 @@ public void testStatefulSetWithService() { var kubeURI = KubernetesResourceUri.parse("statefulsets.v1.apps/" + namespace + "/example-statefulset-with-service"); StatefulSet statefulSet = mockServer.getClient().apps().statefulSets().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset.yaml")).item(); mockServer.getClient().resource(statefulSet).inNamespace(namespace).createOrReplace(); Service service = mockServer.getClient().services().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-service.yaml")).item(); mockServer.getClient().resource(service).inNamespace(namespace).createOrReplace(); Optional url = discovery.query(kubeURI).map(URI::toString); @@ -92,7 +92,7 @@ public void testStatefulSetWithService() { public void testStatefulSetWithServiceWithCustomPortName() { var kubeURI = KubernetesResourceUri.parse("statefulsets.v1.apps/" + namespace + "/custom-port-statefulset?port-name=my-custom-port-stateful"); StatefulSet statefulSet = mockServer.getClient().apps().statefulSets().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset.yaml")).item(); statefulSet.getMetadata().setName("custom-port-statefulset"); statefulSet.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts() .add(new ContainerPortBuilder().withName("test-port").withContainerPort(4000).build()); @@ -101,7 +101,7 @@ public void testStatefulSetWithServiceWithCustomPortName() { mockServer.getClient().resource(statefulSet).inNamespace(namespace).createOrReplace(); Service service = mockServer.getClient().services().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-service.yaml")).item(); service.getMetadata().setName("custom-port-name-service-statefulset"); service.getSpec().getPorts().add(new ServicePortBuilder() .withName("my-custom-port-stateful") @@ -120,11 +120,11 @@ public void testStatefulSetNoService() { var kubeURI = KubernetesResourceUri.parse("statefulsets.v1.apps/" + namespace + "/process-quarkus-example-statefulset-no-service"); StatefulSet statefulSet = mockServer.getClient().apps().statefulSets().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-no-service.yaml")).item(); StatefulSet createdDeployment = mockServer.getClient().resource(statefulSet).inNamespace(namespace).createOrReplace(); Pod pod = mockServer.getClient().pods().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-pod-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-pod-no-service.yaml")).item(); pod.getMetadata().setName("pod-deployment-no-service"); pod.getMetadata().getOwnerReferences().get(0).setUid(createdDeployment.getMetadata().getUid()); mockServer.getClient().resource(pod).inNamespace(namespace).createOrReplace(); @@ -138,13 +138,13 @@ public void testStatefulSetNoService2Replicas() { var kubeURI = KubernetesResourceUri.parse("statefulsets.v1.apps/" + namespace + "/example-statefulset-no-service-2-replicas"); StatefulSet statefulSet = mockServer.getClient().apps().statefulSets().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-no-service.yaml")).item(); statefulSet.getMetadata().setName("example-statefulset-no-service-2-replicas"); statefulSet.getStatus().setReplicas(2); StatefulSet createdstatefulSet = mockServer.getClient().resource(statefulSet).inNamespace(namespace).createOrReplace(); Pod pod = mockServer.getClient().pods().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-pod-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-pod-no-service.yaml")).item(); pod.getMetadata().setName("pod-2-replicas"); pod.getMetadata().getOwnerReferences().get(0).setUid(createdstatefulSet.getMetadata().getUid()); mockServer.getClient().resource(pod).inNamespace(namespace).createOrReplace(); @@ -158,14 +158,14 @@ public void testStatefulSetNoServiceCustomPortName() { var kubeURI = KubernetesResourceUri.parse("statefulsets.v1.apps/" + namespace + "/custom-port-statefulset-1?port-name=my-custom-port"); StatefulSet statefulSet = mockServer.getClient().apps().statefulSets().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-no-service.yaml")).item(); statefulSet.getMetadata().setName("custom-port-statefulset-1"); statefulSet.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts() .add(new ContainerPortBuilder().withName("test-port").withContainerPort(4000).build()); StatefulSet createdStatefulSet = mockServer.getClient().resource(statefulSet).inNamespace(namespace).createOrReplace(); Pod pod = mockServer.getClient().pods().inNamespace(namespace) - .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-pod-no-service.yaml")).get(); + .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-pod-no-service.yaml")).item(); pod.getMetadata().getOwnerReferences().get(0).setUid(createdStatefulSet.getMetadata().getUid()); pod.getSpec().getContainers().get(0).getPorts() .add(new ContainerPortBuilder() diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/pom.xml b/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/pom.xml index 69456f64afd..30e17497f63 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/pom.xml +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-fabric8-kubernetes-service-catalog-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-fabric8-kubernetes-service-catalog-test-utils Kogito Add-On Fabric8 Kubernetes Service Catalog Tests Utils diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/src/main/java/org/kie/kogito/addons/quarkus/k8s/test/utils/KnativeResourceDiscoveryTestUtil.java b/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/src/main/java/org/kie/kogito/addons/quarkus/k8s/test/utils/KnativeResourceDiscoveryTestUtil.java index 24dd54b94b8..4ab6754563d 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/src/main/java/org/kie/kogito/addons/quarkus/k8s/test/utils/KnativeResourceDiscoveryTestUtil.java +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/src/main/java/org/kie/kogito/addons/quarkus/k8s/test/utils/KnativeResourceDiscoveryTestUtil.java @@ -41,7 +41,7 @@ public static void createServiceIfNotExists(KubernetesServer k8sServer, String k Service service = knativeClient.services() .inNamespace(namespace) .load(getResourceAsStream(knativeYaml)) - .get(); + .item(); if (remoteServiceUrl != null) { service.getStatus().setUrl(remoteServiceUrl); diff --git a/quarkus/addons/jobs/common/messaging/pom.xml b/quarkus/addons/jobs/common/messaging/pom.xml index 22e62a859ea..27330b6a498 100644 --- a/quarkus/addons/jobs/common/messaging/pom.xml +++ b/quarkus/addons/jobs/common/messaging/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-jobs-common-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-jobs-common-messaging diff --git a/quarkus/addons/jobs/common/pom.xml b/quarkus/addons/jobs/common/pom.xml index f09218076c5..1e5c4d75ae6 100644 --- a/quarkus/addons/jobs/common/pom.xml +++ b/quarkus/addons/jobs/common/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-jobs-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-jobs-common-parent diff --git a/quarkus/addons/jobs/common/rest-callback/pom.xml b/quarkus/addons/jobs/common/rest-callback/pom.xml index 1cbf7035640..1c83aba8d6b 100644 --- a/quarkus/addons/jobs/common/rest-callback/pom.xml +++ b/quarkus/addons/jobs/common/rest-callback/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-jobs-common-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-rest-callback diff --git a/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java b/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java index 2d07f598e09..3e6a19286b1 100644 --- a/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java +++ b/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java @@ -18,18 +18,6 @@ */ package org.kie.kogito.jobs.quarkus.common; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - import org.kie.kogito.Application; import org.kie.kogito.jobs.api.JobCallbackPayload; import org.kie.kogito.process.Process; @@ -38,6 +26,18 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; + import static org.kie.kogito.jobs.api.JobCallbackResourceDef.JOBS_CALLBACK_POST_URI; import static org.kie.kogito.jobs.api.JobCallbackResourceDef.JOBS_CALLBACK_URI; import static org.kie.kogito.jobs.api.JobCallbackResourceDef.LIMIT; diff --git a/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java b/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java index 0ba367524dd..87417cf1a12 100644 --- a/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java +++ b/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java @@ -20,9 +20,6 @@ import java.util.Optional; -import javax.enterprise.inject.Instance; -import javax.ws.rs.core.Response; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -38,9 +35,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; -import static javax.ws.rs.core.Response.Status.OK; +import jakarta.enterprise.inject.Instance; +import jakarta.ws.rs.core.Response; + +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; diff --git a/quarkus/addons/jobs/knative-eventing/deployment/pom.xml b/quarkus/addons/jobs/knative-eventing/deployment/pom.xml index ae533951277..4636f8d4dd0 100644 --- a/quarkus/addons/jobs/knative-eventing/deployment/pom.xml +++ b/quarkus/addons/jobs/knative-eventing/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-jobs-knative-eventing-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-jobs-knative-eventing-deployment Kogito Add-Ons Quarkus Jobs Knative Eventing - Deployment diff --git a/quarkus/addons/jobs/knative-eventing/pom.xml b/quarkus/addons/jobs/knative-eventing/pom.xml index 372c1a59cc3..3fead709030 100644 --- a/quarkus/addons/jobs/knative-eventing/pom.xml +++ b/quarkus/addons/jobs/knative-eventing/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-jobs-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-jobs-knative-eventing-parent diff --git a/quarkus/addons/jobs/knative-eventing/runtime/pom.xml b/quarkus/addons/jobs/knative-eventing/runtime/pom.xml index ef684cd9739..bfde04edbc2 100644 --- a/quarkus/addons/jobs/knative-eventing/runtime/pom.xml +++ b/quarkus/addons/jobs/knative-eventing/runtime/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-jobs-knative-eventing-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-jobs-knative-eventing Kogito Add-Ons Quarkus Jobs - Knative Eventing @@ -102,7 +102,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java b/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java index d11d0b35c70..f445b3bf8ac 100644 --- a/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java +++ b/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java @@ -20,9 +20,6 @@ import java.net.URI; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; @@ -32,6 +29,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped public class KnativeEventingJobsService extends AbstractReactiveMessagingJobsService { diff --git a/quarkus/addons/jobs/knative-eventing/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/jobs/knative-eventing/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 071e2f53771..80fce6516c4 100644 --- a/quarkus/addons/jobs/knative-eventing/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/jobs/knative-eventing/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -26,6 +26,6 @@ metadata: - bpmn - jobs # TODO: add processes guide - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java b/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java index 74bd0c9b920..d68e2b1a1fd 100644 --- a/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java +++ b/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.Optional; -import javax.ws.rs.core.HttpHeaders; - import org.eclipse.microprofile.reactive.messaging.Emitter; import org.eclipse.microprofile.reactive.messaging.Message; import org.kie.kogito.jobs.messaging.quarkus.AbstractReactiveMessagingJobsServiceTest; @@ -32,6 +30,8 @@ import io.quarkus.reactivemessaging.http.runtime.OutgoingHttpMetadata; +import jakarta.ws.rs.core.HttpHeaders; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.kie.kogito.addon.quarkus.common.reactive.messaging.http.CloudEventHttpOutgoingDecorator.CLOUD_EVENTS_CONTENT_TYPE; diff --git a/quarkus/addons/jobs/management/deployment/pom.xml b/quarkus/addons/jobs/management/deployment/pom.xml index 365a005266e..1408cdd67c7 100644 --- a/quarkus/addons/jobs/management/deployment/pom.xml +++ b/quarkus/addons/jobs/management/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-jobs-management-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-jobs-management-deployment Kogito Add-Ons Quarkus Jobs Management - Deployment diff --git a/quarkus/addons/jobs/management/pom.xml b/quarkus/addons/jobs/management/pom.xml index 5514a57ea2d..7c951403b50 100644 --- a/quarkus/addons/jobs/management/pom.xml +++ b/quarkus/addons/jobs/management/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-jobs-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-jobs-management-parent diff --git a/quarkus/addons/jobs/management/runtime/pom.xml b/quarkus/addons/jobs/management/runtime/pom.xml index 6f3f9015b5c..9a9698f2e42 100644 --- a/quarkus/addons/jobs/management/runtime/pom.xml +++ b/quarkus/addons/jobs/management/runtime/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-jobs-management-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-jobs-management Kogito Add-Ons Quarkus Jobs - Management @@ -110,7 +110,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java index 6b14088785b..f9aaff76044 100644 --- a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java +++ b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java @@ -18,12 +18,12 @@ */ package org.kie.kogito.jobs.management.quarkus; -import javax.enterprise.context.ApplicationScoped; - import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.jackson.ObjectMapperCustomizer; +import jakarta.enterprise.context.ApplicationScoped; + import static org.kie.kogito.jobs.service.api.serlialization.SerializationUtils.registerDescriptors; @ApplicationScoped diff --git a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java index fe8625f8336..a7989885d0a 100644 --- a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java +++ b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java @@ -20,11 +20,6 @@ import java.net.URI; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.jobs.ProcessInstanceJobDescription; import org.kie.kogito.jobs.ProcessJobDescription; @@ -42,6 +37,11 @@ import io.vertx.ext.web.client.WebClient; import io.vertx.ext.web.client.WebClientOptions; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; + import static org.kie.kogito.jobs.service.api.serlialization.SerializationUtils.registerDescriptors; @ApplicationScoped @@ -130,4 +130,4 @@ private void configureMapper(ObjectMapper mapper) { registerDescriptors(mapper); mapper.findAndRegisterModules(); } -} \ No newline at end of file +} diff --git a/quarkus/addons/jobs/management/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/jobs/management/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 4e59ee77874..a704a1a6b13 100644 --- a/quarkus/addons/jobs/management/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/jobs/management/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -26,6 +26,6 @@ metadata: - bpmn - jobs # TODO: add processes guide - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java b/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java index 09e8ba5335f..578d7f954ca 100644 --- a/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java +++ b/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java @@ -18,8 +18,6 @@ */ package org.kie.kogito.jobs.management.quarkus; -import javax.enterprise.inject.Instance; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.kie.kogito.jobs.ProcessInstanceJobDescription; @@ -38,6 +36,8 @@ import io.vertx.ext.web.client.HttpRequest; import io.vertx.ext.web.client.WebClient; +import jakarta.enterprise.inject.Instance; + import static org.mockito.ArgumentCaptor.forClass; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; diff --git a/quarkus/addons/jobs/messaging/deployment/pom.xml b/quarkus/addons/jobs/messaging/deployment/pom.xml index c4b1e10b071..0188fede19e 100644 --- a/quarkus/addons/jobs/messaging/deployment/pom.xml +++ b/quarkus/addons/jobs/messaging/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-jobs-messaging-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-jobs-messaging-deployment Kogito Add-Ons Quarkus Jobs Messaging - Deployment diff --git a/quarkus/addons/jobs/messaging/pom.xml b/quarkus/addons/jobs/messaging/pom.xml index fe22fafd6ea..b3cb76d11ff 100644 --- a/quarkus/addons/jobs/messaging/pom.xml +++ b/quarkus/addons/jobs/messaging/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-jobs-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-jobs-messaging-parent diff --git a/quarkus/addons/jobs/messaging/runtime/pom.xml b/quarkus/addons/jobs/messaging/runtime/pom.xml index b6ac66d31f3..f1f8d7b2283 100644 --- a/quarkus/addons/jobs/messaging/runtime/pom.xml +++ b/quarkus/addons/jobs/messaging/runtime/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-jobs-messaging-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-jobs-messaging Kogito Add-Ons Quarkus Jobs - Messaging @@ -107,7 +107,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java b/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java index 0a0c817288e..53107cf8290 100644 --- a/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java +++ b/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java @@ -20,15 +20,15 @@ import java.net.URI; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped public class ReactiveMessagingJobsService extends AbstractReactiveMessagingJobsService { diff --git a/quarkus/addons/jobs/messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/jobs/messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml index e2b620104aa..77e5874e8c3 100644 --- a/quarkus/addons/jobs/messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/jobs/messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -26,6 +26,6 @@ metadata: - bpmn - jobs # TODO: add processes guide - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/jobs/pom.xml b/quarkus/addons/jobs/pom.xml index 220b11858c5..3ed41db9a4c 100644 --- a/quarkus/addons/jobs/pom.xml +++ b/quarkus/addons/jobs/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-jobs-parent diff --git a/quarkus/addons/knative/eventing/deployment/pom.xml b/quarkus/addons/knative/eventing/deployment/pom.xml index 45f8e87f422..fa40d5f90f0 100644 --- a/quarkus/addons/knative/eventing/deployment/pom.xml +++ b/quarkus/addons/knative/eventing/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-knative-eventing-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-knative-eventing-deployment Kogito Add-On Knative Eventing - Deployment diff --git a/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoProcessKnativeEventingProcessorTest.java b/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoProcessKnativeEventingProcessorTest.java index cd90244aa74..d5a87d21b9e 100644 --- a/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoProcessKnativeEventingProcessorTest.java +++ b/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoProcessKnativeEventingProcessorTest.java @@ -36,6 +36,7 @@ import org.kie.kogito.quarkus.extensions.spi.deployment.KogitoProcessContainerGeneratorBuildItem; import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.kubernetes.spi.DeployStrategy; import io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem; import io.quarkus.kubernetes.spi.KubernetesResourceMetadataBuildItem; @@ -108,7 +109,8 @@ void checkBuiltMetadataWithCEsNotNullSelectedItem() { final MockKogitoKnativeMetadataProducer metadata = new MockKogitoKnativeMetadataProducer(); final KubernetesResourceMetadataBuildItem kubernetesResourceMetadataBuildItem = new KubernetesResourceMetadataBuildItem("kubernetes", "apps", "v1", "Deployment", "name"); final List kubernetesMetaBuildItems = singletonList(kubernetesResourceMetadataBuildItem); - final List deploymentTargets = singletonList(new KubernetesDeploymentTargetBuildItem("kubernetes", "Deployment", "apps", "v1")); + final List deploymentTargets = + singletonList(new KubernetesDeploymentTargetBuildItem("kubernetes", "Deployment", "apps", "v1", DeployStrategy.CreateOrUpdate)); final List extendedCloudEventsBuildItems = singletonList(new KogitoCloudEventsBuildItem(Set.of(EXTENDED_CLOUD_EVENT1, EXTENDED_CLOUD_EVENT2))); doCallRealMethod().when(processor).buildMetadata(singletonList(containerGeneratorBuildItem), extendedCloudEventsBuildItems, deploymentTargets, kubernetesMetaBuildItems, metadata); diff --git a/quarkus/addons/knative/eventing/integration-tests/pom.xml b/quarkus/addons/knative/eventing/integration-tests/pom.xml index 85063ce0a01..37cd67fdb6c 100644 --- a/quarkus/addons/knative/eventing/integration-tests/pom.xml +++ b/quarkus/addons/knative/eventing/integration-tests/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-knative-eventing-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-knative-eventing-integration-tests diff --git a/quarkus/addons/knative/eventing/pom.xml b/quarkus/addons/knative/eventing/pom.xml index b0d311c130c..cd459cc9fc5 100644 --- a/quarkus/addons/knative/eventing/pom.xml +++ b/quarkus/addons/knative/eventing/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-knative-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-knative-eventing-parent diff --git a/quarkus/addons/knative/eventing/runtime/pom.xml b/quarkus/addons/knative/eventing/runtime/pom.xml index 0cd47c2bb56..c36537c12c4 100644 --- a/quarkus/addons/knative/eventing/runtime/pom.xml +++ b/quarkus/addons/knative/eventing/runtime/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-knative-eventing-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -74,7 +74,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java b/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java index 93acac09690..66064308d27 100644 --- a/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java +++ b/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java @@ -23,8 +23,6 @@ import java.net.URISyntaxException; import java.net.UnknownHostException; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.HealthCheckResponseBuilder; @@ -32,6 +30,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.enterprise.context.ApplicationScoped; + import static org.kie.kogito.addons.quarkus.knative.eventing.KnativeEventingConfigSource.K_SINK; /** diff --git a/quarkus/addons/knative/eventing/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/knative/eventing/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 40f07b8d825..dcd7331c704 100644 --- a/quarkus/addons/knative/eventing/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/knative/eventing/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -32,6 +32,6 @@ metadata: - eventing - cloudevents # TODO: add processes guide - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/knative/pom.xml b/quarkus/addons/knative/pom.xml index dad3e0d6279..def779d31b6 100644 --- a/quarkus/addons/knative/pom.xml +++ b/quarkus/addons/knative/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/addons/knative/serving/deployment/pom.xml b/quarkus/addons/knative/serving/deployment/pom.xml index 576dea893b0..e46f33194ea 100644 --- a/quarkus/addons/knative/serving/deployment/pom.xml +++ b/quarkus/addons/knative/serving/deployment/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-knative-serving-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-knative-serving-deployment diff --git a/quarkus/addons/knative/serving/integration-tests/pom.xml b/quarkus/addons/knative/serving/integration-tests/pom.xml index a2b2ffe4797..0f3a9a36bbd 100644 --- a/quarkus/addons/knative/serving/integration-tests/pom.xml +++ b/quarkus/addons/knative/serving/integration-tests/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-knative-serving-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-knative-serving-integration-tests diff --git a/quarkus/addons/knative/serving/pom.xml b/quarkus/addons/knative/serving/pom.xml index badf095e8a0..3f503b125d9 100644 --- a/quarkus/addons/knative/serving/pom.xml +++ b/quarkus/addons/knative/serving/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-knative-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-knative-serving-parent diff --git a/quarkus/addons/knative/serving/runtime/pom.xml b/quarkus/addons/knative/serving/runtime/pom.xml index ada7a01fd73..df374aca89e 100644 --- a/quarkus/addons/knative/serving/runtime/pom.xml +++ b/quarkus/addons/knative/serving/runtime/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-knative-serving-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -114,7 +114,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} 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 index c42d2dccf59..efc157146e3 100644 --- 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 @@ -18,12 +18,12 @@ */ package org.kie.kogito.addons.quarkus.knative.serving.customfunctions; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped final class KnativeWorkItemHandlerConfig extends DefaultWorkItemHandlerConfig { 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 index 4a9a4e9c8e8..3734a916a30 100644 --- 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 @@ -18,9 +18,6 @@ */ package org.kie.kogito.addons.quarkus.knative.serving.customfunctions; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; - import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog; import org.kogito.workitem.rest.RestWorkItemHandlerUtils; @@ -28,6 +25,9 @@ import io.vertx.mutiny.core.Vertx; import io.vertx.mutiny.ext.web.client.WebClient; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; + public final class KnativeWorkItemHandlerProducer { @Inject diff --git a/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java b/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java index e2ac72eb396..be645faa285 100644 --- a/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java +++ b/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java @@ -18,13 +18,13 @@ */ package org.kie.kogito.addons.quarkus.knative.serving.customfunctions; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; - import io.vertx.ext.web.client.WebClientOptions; import io.vertx.mutiny.core.Vertx; import io.vertx.mutiny.ext.web.client.WebClient; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; + public class WebClientProducer { @Inject diff --git a/quarkus/addons/kubernetes/deployment/pom.xml b/quarkus/addons/kubernetes/deployment/pom.xml index 291f8382611..84ebc9fafd6 100644 --- a/quarkus/addons/kubernetes/deployment/pom.xml +++ b/quarkus/addons/kubernetes/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-kubernetes-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-kubernetes-deployment Kogito Add-On Kubernetes - Deployment 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 index 48771f86d1d..3bb8b1988f3 100644 --- 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 @@ -18,8 +18,6 @@ */ package org.kie.kogito.addons.quarkus.kubernetes; -import javax.inject.Inject; - import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; @@ -29,6 +27,8 @@ import io.quarkus.test.QuarkusUnitTest; +import jakarta.inject.Inject; + import static org.junit.jupiter.api.Assertions.assertNotNull; public class KubernetesAddOnTest { diff --git a/quarkus/addons/kubernetes/integration-tests/pom.xml b/quarkus/addons/kubernetes/integration-tests/pom.xml index 51163e99297..24a1959aee7 100644 --- a/quarkus/addons/kubernetes/integration-tests/pom.xml +++ b/quarkus/addons/kubernetes/integration-tests/pom.xml @@ -6,7 +6,7 @@ org.kie.kogito kogito-addons-quarkus-kubernetes-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-kubernetes-integration-tests diff --git a/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java b/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java index b9f49ef000d..3ec9da9d566 100644 --- a/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java +++ b/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java @@ -18,14 +18,14 @@ */ package org.kie.kogito.addons.quarkus.kubernetes; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import org.eclipse.microprofile.config.inject.ConfigProperty; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; + @Path("/foo") @Produces(MediaType.TEXT_PLAIN) public class Foo { diff --git a/quarkus/addons/kubernetes/pom.xml b/quarkus/addons/kubernetes/pom.xml index 97f4c5094c4..e721a4707f1 100644 --- a/quarkus/addons/kubernetes/pom.xml +++ b/quarkus/addons/kubernetes/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/addons/kubernetes/runtime/pom.xml b/quarkus/addons/kubernetes/runtime/pom.xml index 5a8d6944e1c..8eb6aac7288 100644 --- a/quarkus/addons/kubernetes/runtime/pom.xml +++ b/quarkus/addons/kubernetes/runtime/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-kubernetes-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-kubernetes Kogito Add-On Kubernetes @@ -95,7 +95,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java index 8f60636c4ab..c434ccea08b 100644 --- a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java +++ b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java @@ -18,17 +18,17 @@ */ package org.kie.kogito.addons.quarkus.k8s; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.kie.kogito.addons.k8s.EndpointDiscovery; import org.kie.kogito.addons.quarkus.k8s.workitems.QuarkusDiscoveredEndpointCaller; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @ApplicationScoped public class EndpointCallerProducer { diff --git a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java index 631a72cb344..504b84fab48 100644 --- a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java +++ b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java @@ -18,19 +18,19 @@ */ package org.kie.kogito.addons.quarkus.k8s; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; - import org.kie.kogito.addons.k8s.KnativeRouteEndpointDiscovery; import org.kie.kogito.addons.k8s.KubernetesServiceEndpointDiscovery; import org.kie.kogito.addons.k8s.ServiceAndThenRouteEndpointDiscovery; import io.fabric8.kubernetes.client.KubernetesClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; + @ApplicationScoped public class EndpointDiscoveryProducer { diff --git a/quarkus/addons/kubernetes/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/kubernetes/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 912df0b51a3..9f6021ed24a 100644 --- a/quarkus/addons/kubernetes/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/kubernetes/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -24,6 +24,6 @@ metadata: - kogito - kubernetes - knative - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java index 3bc6ad7928d..8bb2ccc044a 100644 --- a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java +++ b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java @@ -25,8 +25,6 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.kie.kogito.addons.k8s.Endpoint; @@ -40,6 +38,8 @@ import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.kubernetes.client.WithKubernetesTestServer; +import jakarta.inject.Inject; + import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; diff --git a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java index 901f7dfe315..98c38f833d9 100644 --- a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java +++ b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java @@ -26,9 +26,6 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Named; - import org.junit.jupiter.api.Test; import org.kie.kogito.addons.k8s.Endpoint; import org.kie.kogito.addons.k8s.EndpointDiscovery; @@ -42,6 +39,9 @@ import io.quarkus.test.kubernetes.client.KubernetesTestServer; import io.quarkus.test.kubernetes.client.WithKubernetesTestServer; +import jakarta.inject.Inject; +import jakarta.inject.Named; + import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; diff --git a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java index 90d5fd773ea..f19c12b1450 100644 --- a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java +++ b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java @@ -20,8 +20,6 @@ import java.net.URI; -import javax.inject.Inject; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog; @@ -31,6 +29,8 @@ import io.quarkus.test.kubernetes.client.KubernetesTestServer; import io.quarkus.test.kubernetes.client.WithKubernetesTestServer; +import jakarta.inject.Inject; + import static org.assertj.core.api.Assertions.assertThat; import static org.kie.kogito.addons.quarkus.k8s.test.utils.KnativeResourceDiscoveryTestUtil.createServiceIfNotExists; @@ -65,4 +65,4 @@ void knativeResource() { assertThat(kubeDiscoveryConfigCacheUpdater.update("knative:services.v1.serving.knative.dev/test/serverless-workflow-greeting-quarkus")) .hasValue(URI.create(remoteServiceUrl)); } -} \ No newline at end of file +} diff --git a/quarkus/addons/mail/deployment/pom.xml b/quarkus/addons/mail/deployment/pom.xml index a04a4995d18..a7c24c3bc7d 100644 --- a/quarkus/addons/mail/deployment/pom.xml +++ b/quarkus/addons/mail/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-mail-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-mail-deployment Kogito Add-On Mail - Deployment diff --git a/quarkus/addons/mail/pom.xml b/quarkus/addons/mail/pom.xml index 594e584e500..7d57719780b 100644 --- a/quarkus/addons/mail/pom.xml +++ b/quarkus/addons/mail/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-mail-parent diff --git a/quarkus/addons/mail/runtime/pom.xml b/quarkus/addons/mail/runtime/pom.xml index 02b09d26b62..9a64b2ddaed 100644 --- a/quarkus/addons/mail/runtime/pom.xml +++ b/quarkus/addons/mail/runtime/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-mail-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-mail Kogito Add-On Mail @@ -61,7 +61,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java b/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java index 90af309c9a3..57581812cf7 100644 --- a/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java +++ b/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java @@ -20,9 +20,6 @@ import java.util.Arrays; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.microprofile.reactive.messaging.Incoming; import org.kie.kogito.event.usertask.UserTaskInstanceDeadlineDataEvent; import org.slf4j.Logger; @@ -31,6 +28,9 @@ import io.quarkus.mailer.Mail; import io.quarkus.mailer.reactive.ReactiveMailer; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped public class QuarkusMailSender { diff --git a/quarkus/addons/mail/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/mail/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 16454fefe63..905a0af7c85 100644 --- a/quarkus/addons/mail/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/mail/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -28,6 +28,6 @@ metadata: - tasks - notification # TODO: add processes guide - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java b/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java index 0489f1ed114..00eb0fe4bc1 100644 --- a/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java +++ b/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.kie.kogito.event.usertask.UserTaskInstanceDeadlineDataEvent; @@ -33,6 +31,8 @@ import io.quarkus.mailer.MockMailbox; import io.quarkus.test.junit.QuarkusTest; +import jakarta.inject.Inject; + import static org.junit.jupiter.api.Assertions.assertEquals; @QuarkusTest diff --git a/quarkus/addons/marshallers/avro/deployment/pom.xml b/quarkus/addons/marshallers/avro/deployment/pom.xml index 73a828bc745..2fe94849877 100644 --- a/quarkus/addons/marshallers/avro/deployment/pom.xml +++ b/quarkus/addons/marshallers/avro/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-marshallers-avro-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-marshallers-avro-deployment diff --git a/quarkus/addons/marshallers/avro/pom.xml b/quarkus/addons/marshallers/avro/pom.xml index 3588d637234..ea07ff61eb9 100644 --- a/quarkus/addons/marshallers/avro/pom.xml +++ b/quarkus/addons/marshallers/avro/pom.xml @@ -23,7 +23,7 @@ org.kie.kogito kogito-addons-quarkus-marshallers-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-marshallers-avro-parent pom diff --git a/quarkus/addons/marshallers/avro/runtime/pom.xml b/quarkus/addons/marshallers/avro/runtime/pom.xml index 8ad177a4926..9ad0a4c9c90 100644 --- a/quarkus/addons/marshallers/avro/runtime/pom.xml +++ b/quarkus/addons/marshallers/avro/runtime/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-marshallers-avro-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-marshallers-avro @@ -47,7 +47,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/marshallers/pom.xml b/quarkus/addons/marshallers/pom.xml index 806e05c3a99..dd63bbac6f3 100644 --- a/quarkus/addons/marshallers/pom.xml +++ b/quarkus/addons/marshallers/pom.xml @@ -23,7 +23,7 @@ org.kie.kogito kogito-addons-quarkus-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-marshallers-parent pom diff --git a/quarkus/addons/messaging/common/pom.xml b/quarkus/addons/messaging/common/pom.xml index cc6eceebcfc..a1258300f92 100644 --- a/quarkus/addons/messaging/common/pom.xml +++ b/quarkus/addons/messaging/common/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-messaging-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-messaging-common Kogito Add-On Messaging - Common @@ -65,8 +65,8 @@ quarkus-core - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api provided @@ -118,7 +118,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java index 8202f616ccb..2b879347029 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java @@ -23,8 +23,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.inject.Inject; - import org.eclipse.microprofile.reactive.messaging.Message; import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecoratorProvider; import org.kie.kogito.event.CloudEventMarshaller; @@ -34,6 +32,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.inject.Inject; + public abstract class AbstractQuarkusCloudEventEmitter implements EventEmitter { private static final Logger logger = LoggerFactory.getLogger(AbstractQuarkusCloudEventEmitter.class); diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java index e0673dc70ff..c25b4dddd4f 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java @@ -22,10 +22,10 @@ import java.util.Map; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; - import io.vertx.core.impl.ConcurrentHashSet; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped public class BackpressureKogitoEmitter implements QuarkusEmitterController { diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java index de9571dce8c..4aa9ac5e1d5 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java @@ -18,9 +18,6 @@ */ package org.kie.kogito.addon.quarkus.messaging.common; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.microprofile.reactive.messaging.Message; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,6 +28,9 @@ import io.smallrye.mutiny.subscription.MultiSubscriber; import io.smallrye.reactive.messaging.providers.PublisherDecorator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped public class BackpressurePublisherDecorator implements PublisherDecorator { diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/ChannelFormat.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/ChannelFormat.java index 2b4930eab77..52912375ef9 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/ChannelFormat.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/ChannelFormat.java @@ -23,7 +23,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; @Qualifier @Retention(RetentionPolicy.RUNTIME) diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java index 6f57ee50c8d..4aa6f126ffa 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java @@ -18,10 +18,6 @@ */ package org.kie.kogito.addon.quarkus.messaging.common; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; - import org.kie.kogito.event.CloudEventMarshaller; import org.kie.kogito.event.EventMarshaller; import org.kie.kogito.event.impl.ByteArrayCloudEventMarshaller; @@ -35,6 +31,10 @@ import io.quarkus.arc.DefaultBean; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; + @ApplicationScoped public class EventMarshallerProducer { diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java index b5c2849f46c..b5cfa8d7c83 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java @@ -18,10 +18,6 @@ */ package org.kie.kogito.addon.quarkus.messaging.common; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; - import org.kie.kogito.event.CloudEventUnmarshallerFactory; import org.kie.kogito.event.EventUnmarshaller; import org.kie.kogito.event.impl.ByteArrayCloudEventUnmarshallerFactory; @@ -33,6 +29,10 @@ import io.quarkus.arc.DefaultBean; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; + @ApplicationScoped public class EventUnmarshallerProducer { diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java index d5233295610..e7e0d41a511 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java @@ -20,15 +20,15 @@ import java.util.concurrent.ExecutorService; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.event.EventExecutorServiceFactory; import org.kie.kogito.event.KogitoEventStreams; import io.quarkus.arc.DefaultBean; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped @DefaultBean public class QuarkusEventExecutorServiceFactory implements EventExecutorServiceFactory { diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java index 2d5691cea40..cf535df32cf 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java @@ -18,9 +18,6 @@ */ package org.kie.kogito.addon.quarkus.messaging.common; -import javax.annotation.PostConstruct; -import javax.inject.Inject; - import org.kie.kogito.event.cloudevents.extension.KogitoExtension; import org.kie.kogito.event.cloudevents.extension.KogitoPredictionsExtension; import org.kie.kogito.event.cloudevents.extension.KogitoProcessExtension; @@ -33,6 +30,9 @@ import io.cloudevents.jackson.JsonFormat; import io.quarkus.runtime.Startup; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; + /** * The goal of this bean is to register the Kogito CloudEvent extension * that allows the system to correctly parse Kogito extension attributes. diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java index ed9e3b9d785..1f3be268b39 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java @@ -21,8 +21,6 @@ import java.util.Set; import java.util.concurrent.ExecutorService; -import javax.inject.Inject; - import org.kie.kogito.Application; import org.kie.kogito.Model; import org.kie.kogito.event.EventExecutorServiceFactory; @@ -31,6 +29,8 @@ import org.kie.kogito.process.Process; import org.kie.kogito.process.ProcessService; +import jakarta.inject.Inject; + public abstract class QuarkusMessageConsumer extends AbstractMessageConsumer { @Inject @@ -49,7 +49,7 @@ protected void init(Process process, String trigger, Class objectClass, Ev init(application, process, trigger, eventReceiver, objectClass, processService, executor, correlation); } - @javax.annotation.PreDestroy + @jakarta.annotation.PreDestroy public void close() { executor.shutdownNow(); } diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java index 7bf474983fc..b4a65353103 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java @@ -22,14 +22,14 @@ import java.util.List; import java.util.Optional; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.microprofile.config.ConfigProvider; import org.kie.kogito.addon.cloudevents.AbstractTopicDiscovery; import org.kie.kogito.event.ChannelType; import org.kie.kogito.event.Topic; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped @Priority(0) public class QuarkusTopicDiscovery extends AbstractTopicDiscovery { diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java index 04e400127a8..b37c1ba4704 100644 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java @@ -18,19 +18,19 @@ */ package org.kie.kogito.addon.quarkus.messaging.common; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import org.kie.kogito.addon.cloudevents.AbstractTopicsInformationResource; import org.kie.kogito.event.TopicDiscovery; import org.kie.kogito.event.cloudevents.CloudEventMeta; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; + @Path("/messaging/topics") @ApplicationScoped() public class QuarkusTopicsInformationResource extends AbstractTopicsInformationResource { @@ -48,7 +48,7 @@ private void onPostConstruct() { @GET() @Produces(MediaType.APPLICATION_JSON) - public javax.ws.rs.core.Response getTopics() { - return javax.ws.rs.core.Response.ok(getTopicList()).build(); + public jakarta.ws.rs.core.Response getTopics() { + return jakarta.ws.rs.core.Response.ok(getTopicList()).build(); } } diff --git a/quarkus/addons/messaging/deployment/pom.xml b/quarkus/addons/messaging/deployment/pom.xml index 41cb959685d..ff5b706029e 100644 --- a/quarkus/addons/messaging/deployment/pom.xml +++ b/quarkus/addons/messaging/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-messaging-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-messaging-deployment Kogito Add-On Messaging - Deployment diff --git a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/ChannelQualifierQuarkusTemplate.java b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/ChannelQualifierQuarkusTemplate.java index 92310808658..5e181d11e14 100644 --- a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/ChannelQualifierQuarkusTemplate.java +++ b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/ChannelQualifierQuarkusTemplate.java @@ -23,7 +23,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; @Qualifier @Retention(RetentionPolicy.RUNTIME) diff --git a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventEmitterQuarkusTemplate.java b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventEmitterQuarkusTemplate.java index c327facbc71..011ab2fcee6 100644 --- a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventEmitterQuarkusTemplate.java +++ b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventEmitterQuarkusTemplate.java @@ -19,9 +19,9 @@ package $Package$; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; diff --git a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventReceiverQuarkusTemplate.java b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventReceiverQuarkusTemplate.java index d08fb836f37..4cd5056c5b2 100644 --- a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventReceiverQuarkusTemplate.java +++ b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventReceiverQuarkusTemplate.java @@ -21,12 +21,12 @@ import java.util.concurrent.CompletionStage; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; -import org.kie.kogito.addon.quarkus.messaging.common.AbstractQuarkusCloudEventReceiver ; +import org.kie.kogito.addon.quarkus.messaging.common.AbstractQuarkusCloudEventReceiver; import io.quarkus.runtime.Startup; diff --git a/quarkus/addons/messaging/integration-tests/pom.xml b/quarkus/addons/messaging/integration-tests/pom.xml index 46712debb59..c23b0396b0d 100644 --- a/quarkus/addons/messaging/integration-tests/pom.xml +++ b/quarkus/addons/messaging/integration-tests/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-messaging-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-messaging-it Kogito Add-On Messaging - Integration Tests diff --git a/quarkus/addons/messaging/integration-tests/src/main/java/org/kie/kogito/integrationtests/QuarkusCloudEventResource.java b/quarkus/addons/messaging/integration-tests/src/main/java/org/kie/kogito/integrationtests/QuarkusCloudEventResource.java index 14d46b5b911..b94a5f83284 100644 --- a/quarkus/addons/messaging/integration-tests/src/main/java/org/kie/kogito/integrationtests/QuarkusCloudEventResource.java +++ b/quarkus/addons/messaging/integration-tests/src/main/java/org/kie/kogito/integrationtests/QuarkusCloudEventResource.java @@ -21,8 +21,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.kie.kogito.addon.quarkus.messaging.common.http.AbstractQuarkusCloudEventResource; diff --git a/quarkus/addons/messaging/integration-tests/src/test/java/org/kie/kogito/integrationtests/QuarkusCloudEventResourceIT.java b/quarkus/addons/messaging/integration-tests/src/test/java/org/kie/kogito/integrationtests/QuarkusCloudEventResourceIT.java index b1d40477a66..be9427a30a5 100644 --- a/quarkus/addons/messaging/integration-tests/src/test/java/org/kie/kogito/integrationtests/QuarkusCloudEventResourceIT.java +++ b/quarkus/addons/messaging/integration-tests/src/test/java/org/kie/kogito/integrationtests/QuarkusCloudEventResourceIT.java @@ -25,9 +25,9 @@ import java.nio.charset.StandardCharsets; import java.util.UUID; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/quarkus/addons/messaging/pom.xml b/quarkus/addons/messaging/pom.xml index 5389476227e..87569f72fd0 100644 --- a/quarkus/addons/messaging/pom.xml +++ b/quarkus/addons/messaging/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-messaging-parent pom diff --git a/quarkus/addons/messaging/runtime/pom.xml b/quarkus/addons/messaging/runtime/pom.xml index 5e5774200d0..9ca973b70d9 100644 --- a/quarkus/addons/messaging/runtime/pom.xml +++ b/quarkus/addons/messaging/runtime/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-messaging-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -59,7 +59,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin @@ -72,7 +72,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java b/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java index fb1acfc266c..d09f7db6d19 100644 --- a/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java +++ b/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java @@ -18,10 +18,6 @@ */ package org.kie.kogito.addon.messaging; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.kie.kogito.addon.quarkus.messaging.common.AbstractQuarkusCloudEventReceiver; import org.kie.kogito.config.ConfigBean; import org.kie.kogito.event.CloudEventUnmarshallerFactory; @@ -29,6 +25,10 @@ import io.quarkus.arc.DefaultBean; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @DefaultBean @ApplicationScoped public class QuarkusDefaultCloudEventReceiver extends AbstractQuarkusCloudEventReceiver { diff --git a/quarkus/addons/messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 41b303bc77f..d40ea9bd414 100644 --- a/quarkus/addons/messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -27,6 +27,6 @@ metadata: - cloudevents - bpmn # TODO: add processes guide - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/microprofile-config-service-catalog/deployment/pom.xml b/quarkus/addons/microprofile-config-service-catalog/deployment/pom.xml index 275247cafab..606dbe9e547 100644 --- a/quarkus/addons/microprofile-config-service-catalog/deployment/pom.xml +++ b/quarkus/addons/microprofile-config-service-catalog/deployment/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-microprofile-config-service-catalog-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-microprofile-config-service-catalog-deployment diff --git a/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml b/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml index 08acbc2650d..5b68d845a67 100644 --- a/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml +++ b/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-microprofile-config-service-catalog-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-microprofile-config-service-catalog-integration-tests diff --git a/quarkus/addons/microprofile-config-service-catalog/pom.xml b/quarkus/addons/microprofile-config-service-catalog/pom.xml index 2716be00da6..121b690f5af 100644 --- a/quarkus/addons/microprofile-config-service-catalog/pom.xml +++ b/quarkus/addons/microprofile-config-service-catalog/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-microprofile-config-service-catalog-parent diff --git a/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml b/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml index d0fbd435846..8b423941f15 100644 --- a/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml +++ b/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-microprofile-config-service-catalog-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-microprofile-config-service-catalog @@ -67,7 +67,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} 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 362a3fcd16e..fcb7e3e1b2c 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 @@ -21,12 +21,12 @@ import java.net.URI; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import org.eclipse.microprofile.config.ConfigProvider; import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog; import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalogKey; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped public class MicroProfileConfigServiceCatalog implements 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 cd8ec75380f..c9240b924f4 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 @@ -18,12 +18,12 @@ */ package org.kie.kogito.addons.quarkus.microprofile.config.service.catalog; -import javax.inject.Inject; - import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalogTest; import io.quarkus.test.junit.QuarkusTest; +import jakarta.inject.Inject; + @QuarkusTest public class MicroProfileConfigServiceCatalogTest extends KubernetesServiceCatalogTest { diff --git a/quarkus/addons/monitoring/core/pom.xml b/quarkus/addons/monitoring/core/pom.xml index 7602e61ae40..5d45b8e02f0 100644 --- a/quarkus/addons/monitoring/core/pom.xml +++ b/quarkus/addons/monitoring/core/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-monitoring-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 kogito-addons-quarkus-monitoring-core 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 84c7a85d72b..3d14b5ecd51 100644 --- 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 @@ -18,10 +18,6 @@ */ package org.kie.kogito.monitoring.core.quarkus; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; - import org.kie.kogito.KogitoGAV; import org.kie.kogito.config.ConfigBean; import org.kie.kogito.drools.core.config.DefaultRuleEventListenerConfig; @@ -35,6 +31,10 @@ import io.micrometer.core.instrument.Metrics; import io.quarkus.arc.properties.IfBuildProperty; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; + @Dependent public class QuarkusEventListenerFactory { diff --git a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java index ca00b36ca01..2bb4ec61365 100644 --- a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java +++ b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java @@ -18,13 +18,6 @@ */ package org.kie.kogito.monitoring.core.quarkus; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.ws.rs.container.DynamicFeature; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.FeatureContext; -import javax.ws.rs.ext.Provider; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.KogitoGAV; import org.kie.kogito.config.ConfigBean; @@ -34,12 +27,19 @@ import io.micrometer.core.instrument.Metrics; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.ws.rs.container.DynamicFeature; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.FeatureContext; +import jakarta.ws.rs.ext.Provider; + @Provider public class QuarkusMetricsFilterRegister implements DynamicFeature { // Indirect Instance to solve warning message during compilation: // WARNING Directly injecting a @ConfigProperty into a JAX-RS provider may lead to unexpected results. - // To ensure proper results, please change the type of the field to javax.enterprise.inject.Instance. + // To ensure proper results, please change the type of the field to jakarta.enterprise.inject.Instance. @ConfigProperty(name = Constants.HTTP_INTERCEPTOR_USE_DEFAULT, defaultValue = "true") Instance httpInterceptorUseDefault; diff --git a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java index 66bfaab7e65..de7b60ff977 100644 --- a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java +++ b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java @@ -20,12 +20,12 @@ import java.util.List; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; - import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; + public class QuarkusMetricsInterceptor implements ContainerResponseFilter { private final MetricsInterceptor metricsInterceptor; diff --git a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java index 9b4e4c7ab76..616a0ce20ee 100644 --- a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java +++ b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java @@ -18,10 +18,6 @@ */ package org.kie.kogito.monitoring.core.quarkus; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.kie.kogito.KogitoGAV; import org.kie.kogito.config.ConfigBean; import org.kie.kogito.monitoring.core.common.system.metrics.SystemMetricsCollector; @@ -30,6 +26,10 @@ import io.micrometer.core.instrument.Metrics; import io.quarkus.runtime.Startup; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @Singleton @Startup public class QuarkusSystemMetricsCollectorProvider implements SystemMetricsCollectorProvider { diff --git a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java index 56c7d8c7963..58b67675016 100644 --- a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java +++ b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java @@ -20,13 +20,13 @@ import java.util.List; -import javax.enterprise.inject.Instance; -import javax.ws.rs.core.FeatureContext; - import org.junit.jupiter.api.Test; import org.kie.kogito.monitoring.core.common.mock.MockedConfigBean; import org.mockito.ArgumentCaptor; +import jakarta.enterprise.inject.Instance; +import jakarta.ws.rs.core.FeatureContext; + import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java index 4e8be58a22f..5814542b851 100644 --- a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java +++ b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java @@ -22,15 +22,15 @@ import java.util.Collections; import java.util.List; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; - import org.junit.jupiter.api.Test; import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor; import org.mockito.ArgumentCaptor; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; + import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/quarkus/addons/monitoring/elastic/deployment/pom.xml b/quarkus/addons/monitoring/elastic/deployment/pom.xml index f154b1a31df..a5a5c66843b 100644 --- a/quarkus/addons/monitoring/elastic/deployment/pom.xml +++ b/quarkus/addons/monitoring/elastic/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-monitoring-elastic-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-monitoring-elastic-deployment Kogito Add-On Monitoring Elastic - Deployment diff --git a/quarkus/addons/monitoring/elastic/pom.xml b/quarkus/addons/monitoring/elastic/pom.xml index bf1719110a9..a2c583635ba 100644 --- a/quarkus/addons/monitoring/elastic/pom.xml +++ b/quarkus/addons/monitoring/elastic/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-monitoring-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-monitoring-elastic-parent pom diff --git a/quarkus/addons/monitoring/elastic/runtime/pom.xml b/quarkus/addons/monitoring/elastic/runtime/pom.xml index 191e6eb5309..9e1753ad731 100644 --- a/quarkus/addons/monitoring/elastic/runtime/pom.xml +++ b/quarkus/addons/monitoring/elastic/runtime/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-monitoring-elastic-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -52,7 +52,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java b/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java index 9d2dca4a9d6..10b5fea409d 100644 --- a/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java +++ b/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java @@ -20,9 +20,6 @@ import java.util.Optional; -import javax.enterprise.event.Observes; -import javax.inject.Singleton; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.monitoring.elastic.common.ElasticConfigFactory; import org.kie.kogito.monitoring.elastic.common.ElasticRegistry; @@ -30,6 +27,9 @@ import io.quarkus.runtime.StartupEvent; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Singleton; + @Singleton public class QuarkusElasticRegistryProvider extends ElasticRegistry { diff --git a/quarkus/addons/monitoring/elastic/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/monitoring/elastic/runtime/src/main/resources/META-INF/quarkus-extension.yaml index d10b7225b15..b360bc8d26b 100644 --- a/quarkus/addons/monitoring/elastic/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/monitoring/elastic/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -24,6 +24,6 @@ metadata: - kogito - elasticsearch - monitoring - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/monitoring/pom.xml b/quarkus/addons/monitoring/pom.xml index 219577df2b7..ef6d12e7de2 100644 --- a/quarkus/addons/monitoring/pom.xml +++ b/quarkus/addons/monitoring/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/addons/monitoring/prometheus/deployment/pom.xml b/quarkus/addons/monitoring/prometheus/deployment/pom.xml index 39a97d80262..5dd7d37ba60 100644 --- a/quarkus/addons/monitoring/prometheus/deployment/pom.xml +++ b/quarkus/addons/monitoring/prometheus/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-monitoring-prometheus-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-monitoring-prometheus-deployment Kogito Add-On Monitoring Prometheus - Deployment diff --git a/quarkus/addons/monitoring/prometheus/pom.xml b/quarkus/addons/monitoring/prometheus/pom.xml index a54844f8141..5394f97c227 100644 --- a/quarkus/addons/monitoring/prometheus/pom.xml +++ b/quarkus/addons/monitoring/prometheus/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-monitoring-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-monitoring-prometheus-parent pom diff --git a/quarkus/addons/monitoring/prometheus/runtime/pom.xml b/quarkus/addons/monitoring/prometheus/runtime/pom.xml index dce794681b7..9912f44c826 100644 --- a/quarkus/addons/monitoring/prometheus/runtime/pom.xml +++ b/quarkus/addons/monitoring/prometheus/runtime/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-monitoring-prometheus-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -73,7 +73,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/monitoring/prometheus/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/monitoring/prometheus/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 3560af68b0b..d56014af7eb 100644 --- a/quarkus/addons/monitoring/prometheus/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/monitoring/prometheus/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -24,6 +24,6 @@ metadata: - kogito - prometheus - monitoring - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/persistence/filesystem/deployment/pom.xml b/quarkus/addons/persistence/filesystem/deployment/pom.xml index 757ac6a503b..ea14518f0a9 100644 --- a/quarkus/addons/persistence/filesystem/deployment/pom.xml +++ b/quarkus/addons/persistence/filesystem/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-persistence-filesystem-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-persistence-filesystem-deployment Kogito Add-On Persistence FileSystem - Deployment diff --git a/quarkus/addons/persistence/filesystem/pom.xml b/quarkus/addons/persistence/filesystem/pom.xml index 0acdf5f2477..eff15214e40 100644 --- a/quarkus/addons/persistence/filesystem/pom.xml +++ b/quarkus/addons/persistence/filesystem/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-persistence-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-persistence-filesystem-parent pom diff --git a/quarkus/addons/persistence/filesystem/runtime/pom.xml b/quarkus/addons/persistence/filesystem/runtime/pom.xml index ae1beb52717..981eb00f928 100644 --- a/quarkus/addons/persistence/filesystem/runtime/pom.xml +++ b/quarkus/addons/persistence/filesystem/runtime/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-persistence-filesystem-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -49,7 +49,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin @@ -62,7 +62,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java b/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java index 254319bd4ab..edc9037092f 100644 --- a/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java +++ b/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java @@ -18,12 +18,12 @@ */ package org.kie.kogito.persistence.quarkus; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.persistence.filesystem.AbstractProcessInstancesFactory; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped public class FileSystemProcessInstancesFactory extends AbstractProcessInstancesFactory { diff --git a/quarkus/addons/persistence/filesystem/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/persistence/filesystem/runtime/src/main/resources/META-INF/quarkus-extension.yaml index f4c2d92e926..29eaf1bdace 100644 --- a/quarkus/addons/persistence/filesystem/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/persistence/filesystem/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -25,6 +25,6 @@ metadata: - persistence - filesystem - process - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/persistence/infinispan/deployment/pom.xml b/quarkus/addons/persistence/infinispan/deployment/pom.xml index 72c4b4604f0..6053371be22 100644 --- a/quarkus/addons/persistence/infinispan/deployment/pom.xml +++ b/quarkus/addons/persistence/infinispan/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-persistence-infinispan-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-persistence-infinispan-deployment Kogito Add-On Persistence Infinispan - Deployment diff --git a/quarkus/addons/persistence/infinispan/health/pom.xml b/quarkus/addons/persistence/infinispan/health/pom.xml index 731d79efa63..f2b9ba98e2b 100644 --- a/quarkus/addons/persistence/infinispan/health/pom.xml +++ b/quarkus/addons/persistence/infinispan/health/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-persistence-infinispan-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -67,7 +67,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java b/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java index e7a94178fa0..803f1ed141d 100644 --- a/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java +++ b/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java @@ -24,8 +24,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.enterprise.inject.Instance; - import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; import org.infinispan.client.hotrod.RemoteCacheManager; @@ -36,6 +34,8 @@ import org.infinispan.client.hotrod.impl.operations.PingResponse; import org.infinispan.client.hotrod.impl.transport.netty.ChannelFactory; +import jakarta.enterprise.inject.Instance; + /** * This is a health check implementation for Infinispan Hot Rod Server, based on client and * {@link RemoteCacheManager}. Basically it executes a ping operation to all nodes and if all are down it responds as @@ -99,4 +99,4 @@ private HealthCheckResponse buildResponse(ChannelFactory channelFactory, boolean private PingOperation invokePingOperation(ChannelFactory channelFactory, OperationsFactory operationsFactory, SocketAddress server) { return channelFactory.fetchChannelAndInvoke(server, operationsFactory.newPingOperation(true)); } -} \ No newline at end of file +} diff --git a/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java b/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java index d8a82321c56..8012fdad3db 100644 --- a/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java +++ b/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java @@ -18,10 +18,6 @@ */ package org.kie.kogito.infinispan.health; -import javax.annotation.Resource; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import org.eclipse.microprofile.health.HealthCheckResponse; import org.infinispan.client.hotrod.RemoteCacheManager; import org.junit.jupiter.api.Test; @@ -30,6 +26,10 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; +import jakarta.annotation.Resource; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; + import static org.assertj.core.api.Assertions.assertThat; @QuarkusTest diff --git a/quarkus/addons/persistence/infinispan/pom.xml b/quarkus/addons/persistence/infinispan/pom.xml index a760936a5d3..14773c47f41 100644 --- a/quarkus/addons/persistence/infinispan/pom.xml +++ b/quarkus/addons/persistence/infinispan/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-persistence-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-persistence-infinispan-parent pom diff --git a/quarkus/addons/persistence/infinispan/runtime/pom.xml b/quarkus/addons/persistence/infinispan/runtime/pom.xml index 37dc06d0772..f933c13c4f2 100644 --- a/quarkus/addons/persistence/infinispan/runtime/pom.xml +++ b/quarkus/addons/persistence/infinispan/runtime/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-persistence-infinispan-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -49,7 +49,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin @@ -62,7 +62,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java b/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java index 44426742347..da761d600a1 100644 --- a/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java +++ b/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java @@ -20,13 +20,13 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.infinispan.client.hotrod.RemoteCacheManager; import org.kie.kogito.infinispan.AbstractProcessInstancesFactory; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped public class InfinispanProcessInstancesFactory extends AbstractProcessInstancesFactory { diff --git a/quarkus/addons/persistence/infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/persistence/infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 48fc61d4d16..ccfa3673253 100644 --- a/quarkus/addons/persistence/infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/persistence/infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -25,6 +25,6 @@ metadata: - persistence - infinispan - process - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/persistence/jdbc/deployment/pom.xml b/quarkus/addons/persistence/jdbc/deployment/pom.xml index f7869cde90b..9a0c2be46cf 100644 --- a/quarkus/addons/persistence/jdbc/deployment/pom.xml +++ b/quarkus/addons/persistence/jdbc/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-persistence-jdbc-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-persistence-jdbc-deployment Kogito Add-On Persistence JDBC - Deployment diff --git a/quarkus/addons/persistence/jdbc/pom.xml b/quarkus/addons/persistence/jdbc/pom.xml index 2f0ebc66c64..7b6077f6502 100644 --- a/quarkus/addons/persistence/jdbc/pom.xml +++ b/quarkus/addons/persistence/jdbc/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-persistence-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-persistence-jdbc-parent pom diff --git a/quarkus/addons/persistence/jdbc/runtime/pom.xml b/quarkus/addons/persistence/jdbc/runtime/pom.xml index 662f3f42269..3cc61f98b16 100644 --- a/quarkus/addons/persistence/jdbc/runtime/pom.xml +++ b/quarkus/addons/persistence/jdbc/runtime/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-persistence-jdbc-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -63,7 +63,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin @@ -76,7 +76,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java index 6cf9776ceb2..2d7a4d98e17 100644 --- a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java +++ b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java @@ -18,13 +18,14 @@ */ package org.kie.kogito.persistence.quarkus; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; import javax.sql.DataSource; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.persistence.jdbc.AbstractProcessInstancesFactory; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped public class JDBCProcessInstancesFactory extends AbstractProcessInstancesFactory { diff --git a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java index a4aefa406be..8bbcc59412e 100644 --- a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java +++ b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java @@ -21,7 +21,6 @@ import java.sql.Connection; import java.sql.SQLException; -import javax.enterprise.inject.Produces; import javax.sql.DataSource; import org.kie.kogito.correlation.CorrelationService; @@ -31,6 +30,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.enterprise.inject.Produces; + public class JDBCorrelationServiceProducer { private static final Logger LOGGER = LoggerFactory.getLogger(JDBCorrelationServiceProducer.class); diff --git a/quarkus/addons/persistence/jdbc/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/persistence/jdbc/runtime/src/main/resources/META-INF/quarkus-extension.yaml index f24f7e367d6..ceac5c3c3e0 100644 --- a/quarkus/addons/persistence/jdbc/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/persistence/jdbc/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -25,6 +25,6 @@ metadata: - persistence - jdbc - process - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/persistence/kafka/deployment/pom.xml b/quarkus/addons/persistence/kafka/deployment/pom.xml index 9b65cfa6664..732ebe6096f 100644 --- a/quarkus/addons/persistence/kafka/deployment/pom.xml +++ b/quarkus/addons/persistence/kafka/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-persistence-kafka-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-persistence-kafka-deployment Kogito Add-On Persistence Kafka Streams - Deployment diff --git a/quarkus/addons/persistence/kafka/pom.xml b/quarkus/addons/persistence/kafka/pom.xml index 1cd68ba84f9..b7cb1ddfb45 100644 --- a/quarkus/addons/persistence/kafka/pom.xml +++ b/quarkus/addons/persistence/kafka/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-persistence-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-persistence-kafka-parent pom diff --git a/quarkus/addons/persistence/kafka/runtime/pom.xml b/quarkus/addons/persistence/kafka/runtime/pom.xml index 796a2bf0e4b..dace71b00b4 100644 --- a/quarkus/addons/persistence/kafka/runtime/pom.xml +++ b/quarkus/addons/persistence/kafka/runtime/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-persistence-kafka-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -91,7 +91,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin @@ -121,7 +121,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java index b5be2b3d0e2..892e44fc553 100644 --- a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java +++ b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java @@ -20,10 +20,6 @@ import java.util.Map; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.common.serialization.ByteArraySerializer; import org.apache.kafka.common.serialization.StringSerializer; @@ -36,6 +32,10 @@ import io.smallrye.common.annotation.Identifier; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped public class KafkaProcessInstancesFactory implements ProcessInstancesFactory { diff --git a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java index 1001f512a9f..77b229715d3 100644 --- a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java +++ b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java @@ -22,16 +22,16 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.StoreQueryParameters; import org.apache.kafka.streams.state.QueryableStoreTypes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + import static org.kie.kogito.persistence.kafka.KafkaPersistenceUtils.storeName; @ApplicationScoped diff --git a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java index 11b87ac30ea..fb40606bba7 100644 --- a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java +++ b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java @@ -18,11 +18,11 @@ */ package org.kie.kogito.persistence.kafka; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; - import org.apache.kafka.streams.Topology; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; + import static org.kie.kogito.persistence.kafka.KafkaPersistenceUtils.createTopologyForProcesses; @ApplicationScoped diff --git a/quarkus/addons/persistence/kafka/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/persistence/kafka/runtime/src/main/resources/META-INF/quarkus-extension.yaml index d4e8f732a34..1486e40cac5 100644 --- a/quarkus/addons/persistence/kafka/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/persistence/kafka/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -25,6 +25,6 @@ metadata: - persistence - kafka - process - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/persistence/mongodb/deployment/pom.xml b/quarkus/addons/persistence/mongodb/deployment/pom.xml index 5c53f03e259..0197ee9674b 100644 --- a/quarkus/addons/persistence/mongodb/deployment/pom.xml +++ b/quarkus/addons/persistence/mongodb/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-persistence-mongodb-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-persistence-mongodb-deployment Kogito Add-On Persistence MongoDB - Deployment diff --git a/quarkus/addons/persistence/mongodb/pom.xml b/quarkus/addons/persistence/mongodb/pom.xml index 06b630fca53..e201098b280 100644 --- a/quarkus/addons/persistence/mongodb/pom.xml +++ b/quarkus/addons/persistence/mongodb/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-persistence-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-persistence-mongodb-parent pom diff --git a/quarkus/addons/persistence/mongodb/runtime/pom.xml b/quarkus/addons/persistence/mongodb/runtime/pom.xml index df3c14557eb..6d58d264940 100644 --- a/quarkus/addons/persistence/mongodb/runtime/pom.xml +++ b/quarkus/addons/persistence/mongodb/runtime/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-persistence-mongodb-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -53,7 +53,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin @@ -66,7 +66,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java index 5a4ab35c7d0..19f4ad110a7 100644 --- a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java +++ b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java @@ -18,15 +18,15 @@ */ package org.kie.kogito.persistence.quarkus; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.mongodb.AbstractProcessInstancesFactory; import org.kie.kogito.mongodb.transaction.AbstractTransactionManager; import com.mongodb.client.MongoClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped public class MongoDBProcessInstancesFactory extends AbstractProcessInstancesFactory { diff --git a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java index d237aaf1dac..a56052b84f5 100644 --- a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java +++ b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java @@ -18,14 +18,14 @@ */ package org.kie.kogito.persistence.quarkus; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.mongodb.transaction.AbstractTransactionManager; import com.mongodb.client.MongoClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped public class MongoDBTransactionManager extends AbstractTransactionManager { diff --git a/quarkus/addons/persistence/mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/persistence/mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml index f5187e3bdd4..8e637f0b08c 100644 --- a/quarkus/addons/persistence/mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/persistence/mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -25,6 +25,6 @@ metadata: - persistence - mongodb - process - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/persistence/pom.xml b/quarkus/addons/persistence/pom.xml index ab9a4f41212..fab2b3e22a3 100644 --- a/quarkus/addons/persistence/pom.xml +++ b/quarkus/addons/persistence/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/addons/persistence/postgresql/deployment/pom.xml b/quarkus/addons/persistence/postgresql/deployment/pom.xml index 029deeb9e24..1fcf1e1ecdf 100644 --- a/quarkus/addons/persistence/postgresql/deployment/pom.xml +++ b/quarkus/addons/persistence/postgresql/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-persistence-postgresql-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-persistence-postgresql-deployment Kogito Add-On Persistence PostgreSQL - Deployment diff --git a/quarkus/addons/persistence/postgresql/pom.xml b/quarkus/addons/persistence/postgresql/pom.xml index 4404e79f6de..62ab3aaf3e1 100644 --- a/quarkus/addons/persistence/postgresql/pom.xml +++ b/quarkus/addons/persistence/postgresql/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-persistence-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-persistence-postgresql-parent pom diff --git a/quarkus/addons/persistence/postgresql/runtime/pom.xml b/quarkus/addons/persistence/postgresql/runtime/pom.xml index 692796ad396..651e19497c0 100644 --- a/quarkus/addons/persistence/postgresql/runtime/pom.xml +++ b/quarkus/addons/persistence/postgresql/runtime/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-persistence-postgresql-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -62,7 +62,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin @@ -75,7 +75,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java b/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java index 042466ddf85..b4cc079d252 100644 --- a/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java +++ b/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java @@ -18,14 +18,14 @@ */ package org.kie.kogito.persistence.quarkus; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.persistence.postgresql.AbstractProcessInstancesFactory; import io.vertx.pgclient.PgPool; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped public class PostgresqlProcessInstancesFactory extends AbstractProcessInstancesFactory { diff --git a/quarkus/addons/persistence/postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/persistence/postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml index af868f862a1..eccc3735866 100644 --- a/quarkus/addons/persistence/postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/persistence/postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -25,6 +25,6 @@ metadata: - persistence - postgresql - process - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/persistence/rocksdb/deployment/pom.xml b/quarkus/addons/persistence/rocksdb/deployment/pom.xml index d7aa23ff58a..80833f53fb9 100644 --- a/quarkus/addons/persistence/rocksdb/deployment/pom.xml +++ b/quarkus/addons/persistence/rocksdb/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-persistence-rocksdb-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-persistence-rocksdb-deployment Kogito Add-On Persistence Rocksdb - Deployment diff --git a/quarkus/addons/persistence/rocksdb/pom.xml b/quarkus/addons/persistence/rocksdb/pom.xml index 3fbd79774f8..67c2762af9f 100644 --- a/quarkus/addons/persistence/rocksdb/pom.xml +++ b/quarkus/addons/persistence/rocksdb/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-persistence-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-persistence-rocksdb-parent pom diff --git a/quarkus/addons/persistence/rocksdb/runtime/pom.xml b/quarkus/addons/persistence/rocksdb/runtime/pom.xml index 8b9c28b96c5..0efee464c47 100644 --- a/quarkus/addons/persistence/rocksdb/runtime/pom.xml +++ b/quarkus/addons/persistence/rocksdb/runtime/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-persistence-rocksdb-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -48,7 +48,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin @@ -61,7 +61,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java b/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java index 4cd5e21188f..8d9a14b874d 100644 --- a/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java +++ b/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java @@ -18,12 +18,6 @@ */ package org.kie.kogito.persistence.quarkus.rocksdb; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; - import org.kie.kogito.persistence.rocksdb.RocksDBProcessInstancesFactory; import org.kie.kogito.process.ProcessInstancesFactory; import org.rocksdb.Options; @@ -32,6 +26,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; + @ApplicationScoped public class RocksDbProcessInstancesFactoryProducer { diff --git a/quarkus/addons/persistence/rocksdb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/persistence/rocksdb/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 2221e259d20..a8d9cc40df7 100644 --- a/quarkus/addons/persistence/rocksdb/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/persistence/rocksdb/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -25,6 +25,6 @@ metadata: - persistence - rocksdb - process - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/pom.xml b/quarkus/addons/pom.xml index a78c5ea1188..18865b25f08 100644 --- a/quarkus/addons/pom.xml +++ b/quarkus/addons/pom.xml @@ -25,7 +25,7 @@ kogito-quarkus-bom org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../bom/pom.xml 4.0.0 diff --git a/quarkus/addons/process-definitions/.gitignore b/quarkus/addons/process-definitions/.gitignore new file mode 100644 index 00000000000..2cd3559ddb9 --- /dev/null +++ b/quarkus/addons/process-definitions/.gitignore @@ -0,0 +1 @@ +rockdstemp/ \ No newline at end of file diff --git a/quarkus/addons/process-definitions/deployment/pom.xml b/quarkus/addons/process-definitions/deployment/pom.xml index f09ef823cb3..aa3ded3949e 100644 --- a/quarkus/addons/process-definitions/deployment/pom.xml +++ b/quarkus/addons/process-definitions/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-process-definitions-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-process-definitions-deployment Kogito Add-On Process Definitions - Deployment diff --git a/quarkus/addons/process-definitions/pom.xml b/quarkus/addons/process-definitions/pom.xml index 9c3202c835f..59e6cea628d 100644 --- a/quarkus/addons/process-definitions/pom.xml +++ b/quarkus/addons/process-definitions/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/addons/process-definitions/runtime/pom.xml b/quarkus/addons/process-definitions/runtime/pom.xml index acebafd0ea2..426d2f5061e 100644 --- a/quarkus/addons/process-definitions/runtime/pom.xml +++ b/quarkus/addons/process-definitions/runtime/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-process-definitions-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-process-definitions Kogito Add-On Process Definitions diff --git a/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java b/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java index b2cc040a5c6..5e8022f4e92 100644 --- a/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java +++ b/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java @@ -21,18 +21,6 @@ import java.io.IOException; import java.io.StringReader; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import org.kie.kogito.process.ProcessInstancesFactory; import org.kie.kogito.serverless.workflow.executor.StaticWorkflowApplication; import org.kie.kogito.serverless.workflow.models.JsonNodeModel; @@ -42,6 +30,18 @@ import com.fasterxml.jackson.databind.node.NullNode; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + @Path("/") public class ProcessDefinitionsResource { diff --git a/quarkus/addons/process-management/deployment/pom.xml b/quarkus/addons/process-management/deployment/pom.xml index 0da29115a52..70daf447aef 100644 --- a/quarkus/addons/process-management/deployment/pom.xml +++ b/quarkus/addons/process-management/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-process-management-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-process-management-deployment Kogito Add-On Process Management - Deployment diff --git a/quarkus/addons/process-management/integration-tests/pom.xml b/quarkus/addons/process-management/integration-tests/pom.xml index 17809534483..a56f59f2dd9 100644 --- a/quarkus/addons/process-management/integration-tests/pom.xml +++ b/quarkus/addons/process-management/integration-tests/pom.xml @@ -23,7 +23,7 @@ org.kie.kogito kogito-addons-quarkus-process-management-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-process-management-integration-tests Kogito:: Addons :: Quarkus:: Process Management :: Integration Test diff --git a/quarkus/addons/process-management/pom.xml b/quarkus/addons/process-management/pom.xml index 9c1d3357bb0..45bb342a530 100644 --- a/quarkus/addons/process-management/pom.xml +++ b/quarkus/addons/process-management/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/addons/process-management/runtime/pom.xml b/quarkus/addons/process-management/runtime/pom.xml index 56b200c8af7..ba1d9ef5e7a 100644 --- a/quarkus/addons/process-management/runtime/pom.xml +++ b/quarkus/addons/process-management/runtime/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-process-management-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-process-management Kogito Add-On Process Management @@ -80,9 +80,10 @@ test - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api test + 4.0.1 @@ -90,7 +91,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java b/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java index a8c0ffd9afd..80c160c2bca 100644 --- a/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java +++ b/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java @@ -18,21 +18,21 @@ */ package org.kie.kogito.process.management; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - import org.kie.kogito.Application; import org.kie.kogito.process.Processes; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; + @Path("/management/processes/") public class ProcessInstanceManagementResource extends BaseProcessInstanceManagementResource { diff --git a/quarkus/addons/process-management/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/process-management/runtime/src/main/resources/META-INF/quarkus-extension.yaml index f96e95bbdcc..4e3547d2192 100644 --- a/quarkus/addons/process-management/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/process-management/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -24,6 +24,6 @@ metadata: - kogito - process - management - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java b/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java index 7db5f82d619..0a40abf59af 100644 --- a/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java +++ b/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java @@ -20,13 +20,6 @@ import java.util.Optional; -import javax.enterprise.inject.Instance; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.Response.StatusType; -import javax.ws.rs.ext.RuntimeDelegate; - import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -46,6 +39,13 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.stubbing.Answer; +import jakarta.enterprise.inject.Instance; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.ext.RuntimeDelegate; + import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; diff --git a/quarkus/addons/process-svg/deployment/pom.xml b/quarkus/addons/process-svg/deployment/pom.xml index ee07f7a5fa0..50232dbeee6 100644 --- a/quarkus/addons/process-svg/deployment/pom.xml +++ b/quarkus/addons/process-svg/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-process-svg-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-process-svg-deployment Kogito Add-On Process SVG - Deployment diff --git a/quarkus/addons/process-svg/pom.xml b/quarkus/addons/process-svg/pom.xml index 622cc82723f..381b1a70023 100644 --- a/quarkus/addons/process-svg/pom.xml +++ b/quarkus/addons/process-svg/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/addons/process-svg/runtime/pom.xml b/quarkus/addons/process-svg/runtime/pom.xml index 5a8dec89b9b..df3f03bfe12 100644 --- a/quarkus/addons/process-svg/runtime/pom.xml +++ b/quarkus/addons/process-svg/runtime/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-process-svg-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-process-svg Kogito Add-On Process SVG @@ -38,8 +38,8 @@ kogito-addons-process-svg - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api @@ -93,7 +93,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java index e5763343ce1..063c285ada1 100644 --- a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java +++ b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java @@ -23,10 +23,6 @@ import java.util.ArrayList; import java.util.List; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.svg.ProcessSVGException; import org.slf4j.Logger; @@ -39,6 +35,10 @@ import io.vertx.ext.web.client.WebClient; import io.vertx.ext.web.client.WebClientOptions; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + import static java.util.Collections.emptyList; import static java.util.Collections.singletonMap; import static java.util.Objects.nonNull; diff --git a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java index 31e75cd2562..4f4494d7cb2 100644 --- a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java +++ b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java @@ -20,21 +20,21 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; - import org.kie.kogito.svg.ProcessSvgService; import io.quarkus.security.credential.TokenCredential; import io.quarkus.security.identity.SecurityIdentity; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; + @ApplicationScoped @Path("/svg") public class ProcessSvgResource { diff --git a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java index a648a30cd37..9ce481f86d2 100644 --- a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java +++ b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java @@ -20,13 +20,13 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.svg.AbstractProcessSvgService; import org.kie.kogito.svg.dataindex.DataIndexClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped public class QuarkusProcessSvgService extends AbstractProcessSvgService { diff --git a/quarkus/addons/process-svg/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/process-svg/runtime/src/main/resources/META-INF/quarkus-extension.yaml index f8592c6ddd4..51948695a15 100644 --- a/quarkus/addons/process-svg/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/process-svg/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -24,6 +24,6 @@ metadata: - kogito - process - svg - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/python/deployment/pom.xml b/quarkus/addons/python/deployment/pom.xml index 140c2349fde..a0daea160b6 100644 --- a/quarkus/addons/python/deployment/pom.xml +++ b/quarkus/addons/python/deployment/pom.xml @@ -23,7 +23,7 @@ org.kie.kogito kogito-addons-quarkus-serverless-workflow-python-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-serverless-workflow-python-deployment Kogito:: Addons :: Quarkus:: Serverless Workflow:: Python:: Deployment diff --git a/quarkus/addons/python/integration-tests/pom.xml b/quarkus/addons/python/integration-tests/pom.xml index 64bfbb36317..f5f387151a9 100644 --- a/quarkus/addons/python/integration-tests/pom.xml +++ b/quarkus/addons/python/integration-tests/pom.xml @@ -23,7 +23,7 @@ org.kie.kogito kogito-addons-quarkus-serverless-workflow-python-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-serverless-workflow-python-integration-tests Kogito:: Addons :: Quarkus:: Serverless Workflow:: Python:: Integration Test @@ -116,7 +116,7 @@ - + jep generate-resources @@ -126,7 +126,7 @@ pip install - jep + jep==4.2.0 @@ -152,7 +152,7 @@ maven-failsafe-plugin - ${env.JAVA_HOME}/lib/server + ${env.JAVA_HOME}/lib/server;${env.GRAALVM_HOME}/lib/server diff --git a/quarkus/addons/python/pom.xml b/quarkus/addons/python/pom.xml index 28b3c6929b9..973916b8e25 100644 --- a/quarkus/addons/python/pom.xml +++ b/quarkus/addons/python/pom.xml @@ -23,7 +23,7 @@ org.kie.kogito kogito-addons-quarkus-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-serverless-workflow-python-parent Kogito:: Addons :: Quarkus:: Serverless Workflow:: Python:: Parent diff --git a/quarkus/addons/python/runtime/pom.xml b/quarkus/addons/python/runtime/pom.xml index 25346fb20ee..75e7c6e33a6 100644 --- a/quarkus/addons/python/runtime/pom.xml +++ b/quarkus/addons/python/runtime/pom.xml @@ -24,7 +24,7 @@ org.kie.kogito kogito-addons-quarkus-serverless-workflow-python-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT Kogito:: Addons :: Quarkus:: Serverless Workflow:: Python:: Runtime Python support for serverless workflow diff --git a/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java b/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java index f32843b94bf..08d4a34e620 100644 --- a/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java +++ b/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java @@ -18,15 +18,15 @@ */ package org.kie.kogito.quarkus.serverless.workflow.python; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; - import org.kie.kogito.internal.process.runtime.KogitoWorkItemHandler; import org.kie.kogito.process.impl.CachedWorkItemHandlerConfig; import org.kie.kogito.serverless.workflow.python.PythonScriptWorkItemHandler; import org.kie.kogito.serverless.workflow.python.PythonServiceWorkItemHandler; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped public class PythonWorkItemHandlerConfig extends CachedWorkItemHandlerConfig { diff --git a/quarkus/addons/python/runtime/src/main/resources/META-INF/native-image/jni-config.json b/quarkus/addons/python/runtime/src/main/resources/META-INF/native-image/jni-config.json index 6ed2a8dc04f..6814b8c68c2 100644 --- a/quarkus/addons/python/runtime/src/main/resources/META-INF/native-image/jni-config.json +++ b/quarkus/addons/python/runtime/src/main/resources/META-INF/native-image/jni-config.json @@ -29,6 +29,7 @@ { "name": "java.util.Map$Entry[]" }, + {"name":"java.lang.reflect.AnnotatedElement", "allPublicMethods": true}, {"name":"java.lang.IllegalStateException","allPublicMethods":true}, {"name":"java.lang.NoSuchMethodError","allPublicMethods":true,"allPublicConstructors":true, "allPublicClasses": true}, {"name":"java.lang.IllegalStateException[]","allPublicMethods":true}, @@ -237,6 +238,10 @@ { "name": "jep.MainInterpreter" }, + { + "name": "jep.PyMethod", + "allPublicMethods": true + }, { "name": "jep.NDArray", "allPublicMethods": true, @@ -245,5 +250,9 @@ { "name": "jep.ClassList", "allPublicMethods": true + }, + { + "name": "java.lang.reflect.Executable", + "allPublicMethods": true } ] diff --git a/quarkus/addons/rest-exception-handler/pom.xml b/quarkus/addons/rest-exception-handler/pom.xml index 12b7491c889..dd68f22f111 100644 --- a/quarkus/addons/rest-exception-handler/pom.xml +++ b/quarkus/addons/rest-exception-handler/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-rest-exception-handler Kogito :: Rest Exception Handler :: Quarkus @@ -42,8 +42,8 @@ provided - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api provided @@ -67,9 +67,10 @@ test - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api test + 4.0.1 \ No newline at end of file diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionMapper.java index febb17b17d6..21b70e76d74 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionMapper.java @@ -18,8 +18,8 @@ */ package org.kie.kogito.resource.exceptions; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; public abstract class BaseExceptionMapper implements ExceptionMapper { diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ExceptionsHandler.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ExceptionsHandler.java index cdff6f06a0a..ec1bd6679dd 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ExceptionsHandler.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ExceptionsHandler.java @@ -18,9 +18,9 @@ */ package org.kie.kogito.resource.exceptions; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; public class ExceptionsHandler extends BaseExceptionsHandler { diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/IllegalArgumentExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/IllegalArgumentExceptionMapper.java index 92199a00576..56a734a511a 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/IllegalArgumentExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/IllegalArgumentExceptionMapper.java @@ -18,8 +18,8 @@ */ package org.kie.kogito.resource.exceptions; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; @Provider public class IllegalArgumentExceptionMapper extends BaseExceptionMapper { diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java index 8ff7cbe62fc..2f9e0f6a2a2 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java @@ -18,11 +18,11 @@ */ package org.kie.kogito.resource.exceptions; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - import org.kie.kogito.process.workitem.InvalidLifeCyclePhaseException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; + @Provider public class InvalidLifeCyclePhaseExceptionMapper extends BaseExceptionMapper { diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java index 209d2207db3..c5d8785ab6c 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java @@ -18,11 +18,11 @@ */ package org.kie.kogito.resource.exceptions; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - import org.kie.kogito.process.workitem.InvalidTransitionException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; + @Provider public class InvalidTransitionExceptionMapper extends BaseExceptionMapper { diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java index be499edcf00..698a1155e7d 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java @@ -18,11 +18,11 @@ */ package org.kie.kogito.resource.exceptions; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - import org.kie.kogito.process.NodeInstanceNotFoundException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; + @Provider public class NodeInstanceNotFoundExceptionMapper extends BaseExceptionMapper { diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java index 539aa490e7d..182e1df839f 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java @@ -18,11 +18,11 @@ */ package org.kie.kogito.resource.exceptions; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - import org.kie.kogito.process.NodeNotFoundException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; + @Provider public class NodeNotFoundExceptionMapper extends BaseExceptionMapper { diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java index d12161df80a..99b030fc07e 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java @@ -18,11 +18,11 @@ */ package org.kie.kogito.resource.exceptions; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - import org.kie.kogito.process.workitem.NotAuthorizedException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; + @Provider public class NotAuthorizedExceptionMapper extends BaseExceptionMapper { diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java index 02ab9964531..ed9bb35c967 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java @@ -18,11 +18,11 @@ */ package org.kie.kogito.resource.exceptions; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - import org.kie.kogito.process.ProcessInstanceDuplicatedException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; + @Provider public class ProcessInstanceDuplicatedExceptionMapper extends BaseExceptionMapper { diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java index 895f9db7412..9e3f41ef953 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java @@ -18,11 +18,11 @@ */ package org.kie.kogito.resource.exceptions; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - import org.kie.kogito.process.ProcessInstanceExecutionException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; + @Provider public class ProcessInstanceExecutionExceptionMapper extends BaseExceptionMapper { diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java index 7bbbaeee515..46b511d6b35 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java @@ -18,11 +18,11 @@ */ package org.kie.kogito.resource.exceptions; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - import org.kie.kogito.process.ProcessInstanceNotFoundException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; + @Provider public class ProcessInstanceNotFoundExceptionMapper extends BaseExceptionMapper { diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java index ba6b6318b83..85ab766ee42 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java @@ -18,11 +18,11 @@ */ package org.kie.kogito.resource.exceptions; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - import org.kie.kogito.process.VariableViolationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; + @Provider public class VariableViolationExceptionMapper extends BaseExceptionMapper { diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java index 73bdac8cc7f..53f97d5163f 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java @@ -18,11 +18,11 @@ */ package org.kie.kogito.resource.exceptions; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - import org.kie.kogito.process.workitem.WorkItemExecutionException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; + @Provider public class WorkItemExecutionExceptionMapper extends BaseExceptionMapper { diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java index 53b26200d09..1d24e26b21a 100644 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java @@ -18,11 +18,11 @@ */ package org.kie.kogito.resource.exceptions; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - import org.kie.kogito.internal.process.runtime.WorkItemNotFoundException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; + @Provider public class WorkItemNotFoundExceptionMapper extends BaseExceptionMapper { diff --git a/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java b/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java index 15369715df7..028a91a91b5 100644 --- a/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java +++ b/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java @@ -18,17 +18,17 @@ */ package org.kie.kogito.resource.exceptions; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.RuntimeDelegate; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.RuntimeDelegate; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; @@ -97,4 +97,4 @@ void testForbidden() { tested.forbidden(body); assertRequest(Response.Status.FORBIDDEN); } -} \ No newline at end of file +} diff --git a/quarkus/addons/source-files/deployment/pom.xml b/quarkus/addons/source-files/deployment/pom.xml index 3f925ccb3cd..c855e6f0909 100644 --- a/quarkus/addons/source-files/deployment/pom.xml +++ b/quarkus/addons/source-files/deployment/pom.xml @@ -26,7 +26,7 @@ kogito-addons-quarkus-source-files-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-source-files-deployment Kogito Add-On Source Files - Deployment diff --git a/quarkus/addons/source-files/pom.xml b/quarkus/addons/source-files/pom.xml index a0c89db5319..3191674b376 100644 --- a/quarkus/addons/source-files/pom.xml +++ b/quarkus/addons/source-files/pom.xml @@ -30,7 +30,7 @@ kogito-addons-quarkus-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-source-files-parent pom diff --git a/quarkus/addons/source-files/runtime/pom.xml b/quarkus/addons/source-files/runtime/pom.xml index be08c219f55..722fcca5e6b 100644 --- a/quarkus/addons/source-files/runtime/pom.xml +++ b/quarkus/addons/source-files/runtime/pom.xml @@ -26,7 +26,7 @@ kogito-addons-quarkus-source-files-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-source-files @@ -123,7 +123,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesProviderProducer.java b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesProviderProducer.java index ef53747f282..dc4ac4d01d6 100644 --- a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesProviderProducer.java +++ b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesProviderProducer.java @@ -18,9 +18,9 @@ */ package org.kie.kogito.addon.source.files; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Produces; @ApplicationScoped public final class SourceFilesProviderProducer { diff --git a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java index b8d60de9911..4cadb22c29e 100644 --- a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java +++ b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java @@ -18,10 +18,10 @@ */ package org.kie.kogito.addon.source.files; -import javax.enterprise.inject.spi.CDI; - import io.quarkus.runtime.annotations.Recorder; +import jakarta.enterprise.inject.spi.CDI; + @Recorder public class SourceFilesRecorder { diff --git a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java index ab48413783d..a347cf8293d 100644 --- a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java +++ b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java @@ -23,18 +23,18 @@ import java.io.InputStream; import java.util.Collection; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import org.kie.kogito.resource.exceptions.ExceptionsHandler; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + @ApplicationScoped @Path("/management/processes/") public final class SourceFilesResource { diff --git a/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java b/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java index 926b5b0d79c..234b555d94d 100644 --- a/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java +++ b/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java @@ -20,14 +20,14 @@ import java.util.Optional; -import javax.ws.rs.core.Response; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; import io.quarkus.test.junit.QuarkusTest; +import jakarta.ws.rs.core.Response; + import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/quarkus/addons/task-management/deployment/pom.xml b/quarkus/addons/task-management/deployment/pom.xml index 8c7e8f83754..bf86d07c444 100644 --- a/quarkus/addons/task-management/deployment/pom.xml +++ b/quarkus/addons/task-management/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-task-management-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-task-management-deployment Kogito Add-On Task Management - Deployment diff --git a/quarkus/addons/task-management/pom.xml b/quarkus/addons/task-management/pom.xml index 4882dede5d9..2c01a7cadd4 100644 --- a/quarkus/addons/task-management/pom.xml +++ b/quarkus/addons/task-management/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/addons/task-management/runtime/pom.xml b/quarkus/addons/task-management/runtime/pom.xml index 8b32acf4d6d..5a58f17a678 100644 --- a/quarkus/addons/task-management/runtime/pom.xml +++ b/quarkus/addons/task-management/runtime/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-task-management-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-task-management Kogito Add-On Task Management @@ -81,7 +81,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java b/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java index d3b7f7fec62..923933b1865 100644 --- a/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java +++ b/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java @@ -20,19 +20,6 @@ import java.util.List; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PATCH; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import org.kie.kogito.process.ProcessConfig; import org.kie.kogito.process.Processes; import org.kie.kogito.process.workitem.Policies; @@ -40,6 +27,19 @@ import org.kie.kogito.task.management.service.TaskManagementOperations; import org.kie.kogito.task.management.service.TaskManagementService; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PATCH; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + @Path("/management/processes") public class TaskManagementResource { diff --git a/quarkus/addons/task-management/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/task-management/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 50cca8ba42e..0e849e5d102 100644 --- a/quarkus/addons/task-management/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/task-management/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -24,6 +24,6 @@ metadata: - kogito - process - task - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/task-notification/deployment/pom.xml b/quarkus/addons/task-notification/deployment/pom.xml index d8b7feaf077..63e2bf6574c 100644 --- a/quarkus/addons/task-notification/deployment/pom.xml +++ b/quarkus/addons/task-notification/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-task-notification-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-task-notification-deployment Kogito Add-On Task Notification - Deployment diff --git a/quarkus/addons/task-notification/pom.xml b/quarkus/addons/task-notification/pom.xml index 2b57c75cbe2..7f741a0b837 100644 --- a/quarkus/addons/task-notification/pom.xml +++ b/quarkus/addons/task-notification/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/addons/task-notification/runtime/pom.xml b/quarkus/addons/task-notification/runtime/pom.xml index 742c89aa443..bbeb0c43f61 100644 --- a/quarkus/addons/task-notification/runtime/pom.xml +++ b/quarkus/addons/task-notification/runtime/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-quarkus-task-notification-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-task-notification Kogito Add-On Task Notification @@ -83,7 +83,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java b/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java index 774aa066f5f..1984f5cdedf 100644 --- a/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java +++ b/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java @@ -20,9 +20,6 @@ import java.util.Collection; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; import org.kie.kogito.event.DataEvent; @@ -30,6 +27,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped public class NotificationEventPublisher implements EventPublisher { diff --git a/quarkus/addons/task-notification/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/task-notification/runtime/src/main/resources/META-INF/quarkus-extension.yaml index da2d590f4ea..c8b51f5db73 100644 --- a/quarkus/addons/task-notification/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/task-notification/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -26,6 +26,6 @@ metadata: - task - notification - BPMN - guide: https://quarkus.io/version/2.13/guides/kogito + guide: https://quarkus.io/guides/kogito categories: - "business-automation" diff --git a/quarkus/addons/tracing-decision/deployment/pom.xml b/quarkus/addons/tracing-decision/deployment/pom.xml index 14c0348f91f..784ea0acde2 100644 --- a/quarkus/addons/tracing-decision/deployment/pom.xml +++ b/quarkus/addons/tracing-decision/deployment/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-tracing-decision-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-tracing-decision-deployment Kogito Add-On Tracing Decision - Deployment diff --git a/quarkus/addons/tracing-decision/integration-tests/pom.xml b/quarkus/addons/tracing-decision/integration-tests/pom.xml index 79ab1e6c1d6..f07abe568b7 100644 --- a/quarkus/addons/tracing-decision/integration-tests/pom.xml +++ b/quarkus/addons/tracing-decision/integration-tests/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-quarkus-tracing-decision-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-quarkus-tracing-decision-it Kogito Add-On Tracing Decision - Integration tests diff --git a/quarkus/addons/tracing-decision/pom.xml b/quarkus/addons/tracing-decision/pom.xml index 4bcf75c0440..3bc3bc07778 100644 --- a/quarkus/addons/tracing-decision/pom.xml +++ b/quarkus/addons/tracing-decision/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/addons/tracing-decision/runtime/pom.xml b/quarkus/addons/tracing-decision/runtime/pom.xml index 98b4ff95bf0..492de8c3f65 100644 --- a/quarkus/addons/tracing-decision/runtime/pom.xml +++ b/quarkus/addons/tracing-decision/runtime/pom.xml @@ -25,7 +25,7 @@ kogito-addons-quarkus-tracing-decision-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -104,7 +104,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java index 1d64d0f96ee..bc155ee162d 100644 --- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java +++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java @@ -20,9 +20,6 @@ import java.util.function.BiFunction; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.kie.kogito.Application; import org.kie.kogito.config.ConfigBean; import org.kie.kogito.tracing.decision.event.evaluate.EvaluateEvent; @@ -30,6 +27,9 @@ import io.quarkus.vertx.ConsumeEvent; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @Singleton public class QuarkusDecisionTracingCollector { diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java index c6a39d43bd8..86fbe96f9d2 100644 --- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java +++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java @@ -18,13 +18,13 @@ */ package org.kie.kogito.tracing.decision; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import io.vertx.core.eventbus.EventBus; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + /** * This class must always extend org.kie.kogito.tracing.decision.DecisionTracingListener * for code generation plugins to correctly detect if this addon is enabled. diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java index fb09ff6065e..6c999fec150 100644 --- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java +++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java @@ -18,15 +18,16 @@ */ package org.kie.kogito.tracing.decision; -import javax.inject.Inject; -import javax.inject.Singleton; +import java.util.concurrent.Flow.Publisher; import org.eclipse.microprofile.reactive.messaging.Outgoing; import org.kie.kogito.decision.DecisionModelResourcesProvider; -import org.reactivestreams.Publisher; import io.smallrye.mutiny.operators.multi.processors.BroadcastProcessor; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @Singleton public class QuarkusModelEventEmitter extends BaseModelEventEmitter { diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java index c836b2d6349..7b3022bcc86 100644 --- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java +++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java @@ -18,16 +18,16 @@ */ package org.kie.kogito.tracing.decision; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import io.quarkus.runtime.Startup; import io.quarkus.runtime.StartupEvent; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @Singleton @Startup public class QuarkusStartupModelPublisher { diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java index ddad3bd54e0..d2c76b4f3e7 100644 --- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java +++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java @@ -18,14 +18,15 @@ */ package org.kie.kogito.tracing.decision; -import javax.inject.Singleton; +import java.util.concurrent.Flow.Publisher; import org.eclipse.microprofile.reactive.messaging.Outgoing; import org.kie.kogito.tracing.EventEmitter; -import org.reactivestreams.Publisher; import io.smallrye.mutiny.operators.multi.processors.BroadcastProcessor; +import jakarta.inject.Singleton; + @Singleton public class QuarkusTraceEventEmitter implements EventEmitter { diff --git a/quarkus/addons/tracing-decision/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/tracing-decision/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 0cc743e61b9..ff94a8481ed 100644 --- a/quarkus/addons/tracing-decision/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/addons/tracing-decision/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -25,6 +25,6 @@ metadata: - decisions - dmn - tracing - guide: https://quarkus.io/version/2.13/guides/kogito-dmn + guide: https://quarkus.io/guides/kogito-dmn categories: - "business-automation" diff --git a/quarkus/bom/pom.xml b/quarkus/bom/pom.xml index 8aff649b2e4..10f5e98f237 100755 --- a/quarkus/bom/pom.xml +++ b/quarkus/bom/pom.xml @@ -27,7 +27,7 @@ org.kie.kogito quarkus - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-quarkus-bom @@ -36,6 +36,9 @@ Kogito :: Quarkus :: BOM Internal BOM descriptor for Kogito modules targeting Quarkus use-cases. Specific dependencies targeting the Quarkus platform must be added here. + + 6.7.2 + @@ -101,6 +104,18 @@ quarkus-embedded-postgresql-deployment ${version.io.quarkiverse.embedded.postgresql} + + + + io.fabric8 + kubernetes-client + ${version.io.fabric8.kubernetes-client} + + + io.fabric8 + knative-client + ${version.io.fabric8.kubernetes-client} + diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-deployment/pom.xml b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-deployment/pom.xml index cf83d8fe3b6..4ed6b1b024b 100644 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-deployment/pom.xml +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-deployment/pom.xml @@ -25,7 +25,7 @@ kogito-quarkus-decisions-extension org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test-hot-reload/pom.xml b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test-hot-reload/pom.xml index 7616305b2eb..c18ae75e852 100644 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test-hot-reload/pom.xml +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test-hot-reload/pom.xml @@ -25,7 +25,7 @@ kogito-quarkus-decisions-extension org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/pom.xml b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/pom.xml index 8cbe30c9bae..e222d1ace52 100644 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/pom.xml +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/pom.xml @@ -25,7 +25,7 @@ kogito-quarkus-decisions-extension org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -156,7 +156,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java index 547c7ff5098..89505fac8a3 100644 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java @@ -20,19 +20,19 @@ import java.util.Map; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import org.kie.kogito.incubation.application.AppRoot; import org.kie.kogito.incubation.common.DataContext; import org.kie.kogito.incubation.common.MapDataContext; import org.kie.kogito.incubation.decisions.DecisionIds; import org.kie.kogito.incubation.decisions.services.DecisionService; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; + @Path("/custom") public class CustomEndpoint { diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/pom.xml b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/pom.xml index fe43491fb18..ff8fd7df4f2 100644 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/pom.xml +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/pom.xml @@ -23,7 +23,7 @@ kogito-quarkus-decisions-extension org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -90,7 +90,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} @@ -121,7 +121,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/codestarts/quarkus/kogito-dmn-codestart/base/README.tpl.qute.md b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/codestarts/quarkus/kogito-dmn-codestart/base/README.tpl.qute.md index 277cfe31392..55f69a9b876 100644 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/codestarts/quarkus/kogito-dmn-codestart/base/README.tpl.qute.md +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/codestarts/quarkus/kogito-dmn-codestart/base/README.tpl.qute.md @@ -1,7 +1,7 @@ {#include readme-header /} -This Kogito DMN Quarkus codestart contains a sample DMN model as described in the [Quarkus Kogito DMN guide](https://quarkus.io/version/2.13/guides/kogito-dmn). +This Kogito DMN Quarkus codestart contains a sample DMN model as described in the [Quarkus Kogito DMN guide](https://quarkus.io/guides/kogito-dmn). The goal is to showcase automatic REST endpoint codegen, based on the content of the model. The `pricing.dmn` DMN model calculates a base price quotation based on some criteria provided as input. -You can reference the [full guide on the Quarkus website](https://quarkus.io/version/2.13/guides/kogito-dmn). +You can reference the [full guide on the Quarkus website](https://quarkus.io/guides/kogito-dmn). diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/codestarts/quarkus/kogito-dmn-codestart/codestart.yml b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/codestarts/quarkus/kogito-dmn-codestart/codestart.yml index 8abb1a555ed..8b7e8dd93c7 100644 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/codestarts/quarkus/kogito-dmn-codestart/codestart.yml +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/codestarts/quarkus/kogito-dmn-codestart/codestart.yml @@ -24,7 +24,7 @@ tags: extension-codestart metadata: title: Kogito DMN codestart description: This is an example Kogito DMN Quarkus codestart, it contains a sample DMN model for REST code generation based on the model definition. - related-guide-section: https://quarkus.io/version/2.13/guides/kogito-dmn + related-guide-section: https://quarkus.io/guides/kogito-dmn language: base: test-dependencies: diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java index dc27f3b512c..cd21f5a692b 100644 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java @@ -18,10 +18,10 @@ */ package org.kie.kogito.core.decision.incubation.quarkus.support; -import javax.enterprise.context.ApplicationScoped; - import org.kie.kogito.incubation.decisions.DecisionIds; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped class QuarkusDecisionIdFactory extends DecisionIds { } diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java index 4df9c6facea..8014de426d0 100644 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java @@ -18,17 +18,17 @@ */ package org.kie.kogito.core.decision.incubation.quarkus.support; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import org.kie.kogito.decision.DecisionModels; import org.kie.kogito.incubation.common.DataContext; import org.kie.kogito.incubation.common.ExtendedDataContext; import org.kie.kogito.incubation.common.LocalId; import org.kie.kogito.incubation.decisions.services.DecisionService; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; + @ApplicationScoped public class QuarkusDecisionService implements DecisionService { @Inject diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/resources/META-INF/quarkus-extension.yaml index 64fde5ebe62..f0b3620a36d 100644 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/resources/META-INF/quarkus-extension.yaml @@ -25,7 +25,7 @@ metadata: - "drools" - "decisions" - "DMN" - guide: "https://quarkus.io/version/2.13/guides/kogito-dmn" + guide: "https://quarkus.io/guides/kogito-dmn" categories: - "business-automation" codestart: diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/pom.xml b/quarkus/extensions/kogito-quarkus-decisions-extension/pom.xml index 165c6a8583f..cc7731b2464 100644 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/pom.xml +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/pom.xml @@ -25,7 +25,7 @@ quarkus-extensions org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/pom.xml b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/pom.xml index 066b1d50075..304e990571a 100644 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/pom.xml +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/pom.xml @@ -25,7 +25,7 @@ kogito-quarkus-extension-common org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java index 74c5c39f45c..c4c6079bd34 100644 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java @@ -31,9 +31,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.drools.codegen.common.DroolsModelBuildContext; import org.drools.codegen.common.GeneratedFile; import org.drools.codegen.common.GeneratedFileType; @@ -70,6 +67,9 @@ import io.quarkus.resteasy.reactive.spi.GeneratedJaxRsResourceBuildItem; import io.quarkus.vertx.http.deployment.spi.AdditionalStaticResourceBuildItem; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import static org.drools.codegen.common.GeneratedFileType.COMPILED_CLASS; import static org.drools.quarkus.util.deployment.DroolsQuarkusResourceUtils.compileGeneratedSources; import static org.drools.quarkus.util.deployment.DroolsQuarkusResourceUtils.makeBuildItems; diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml index b7353762b0b..3df1dfc55ac 100644 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml @@ -25,7 +25,7 @@ kogito-quarkus-extension-common org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -95,7 +95,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} @@ -112,7 +112,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java index 8fb4babbf47..dde1f4803d5 100644 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java @@ -22,15 +22,15 @@ import java.util.Collections; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import org.kie.kogito.auth.IdentityProvider; import io.quarkus.security.identity.SecurityIdentity; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; + @ApplicationScoped public class QuarkusIdentityProvider implements IdentityProvider { diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java index f928cb9a562..8cd8329586a 100644 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java @@ -20,14 +20,17 @@ import java.util.Optional; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.kie.kogito.KogitoGAV; import org.kie.kogito.config.StaticConfigBean; +import io.quarkus.runtime.Startup; + +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @Singleton +@Startup public class ConfigBean extends StaticConfigBean { @Inject diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java index 4ec977733a0..a9bc0fa236a 100644 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java @@ -18,11 +18,6 @@ */ package org.kie.kogito.quarkus.registry; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import org.kie.kogito.Application; import org.kie.kogito.process.Processes; import org.kie.kogito.quarkus.config.KogitoRuntimeConfig; @@ -30,6 +25,11 @@ import io.quarkus.runtime.StartupEvent; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; + @ApplicationScoped public class ProcessDefinitionRegistration { diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java index 4d18223a60a..8b8da9f3062 100644 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java @@ -18,12 +18,12 @@ */ package org.kie.kogito.quarkus.runtime; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; - import io.quarkus.arc.DefaultBean; import io.vertx.ext.web.client.WebClientOptions; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; + import static org.kogito.workitem.rest.RestWorkItemHandlerUtils.sslWebClientOptions; @ApplicationScoped diff --git a/quarkus/extensions/kogito-quarkus-extension-common/pom.xml b/quarkus/extensions/kogito-quarkus-extension-common/pom.xml index 5d03cb15333..4897d39c998 100644 --- a/quarkus/extensions/kogito-quarkus-extension-common/pom.xml +++ b/quarkus/extensions/kogito-quarkus-extension-common/pom.xml @@ -25,7 +25,7 @@ quarkus-extensions org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/kogito-quarkus-extension-spi/pom.xml b/quarkus/extensions/kogito-quarkus-extension-spi/pom.xml index c569a3affe7..7e6ba7fedda 100644 --- a/quarkus/extensions/kogito-quarkus-extension-spi/pom.xml +++ b/quarkus/extensions/kogito-quarkus-extension-spi/pom.xml @@ -25,7 +25,7 @@ quarkus-extensions org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-deployment/pom.xml b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-deployment/pom.xml index dddc539b29d..badb91343a0 100644 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-deployment/pom.xml +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-deployment/pom.xml @@ -27,7 +27,7 @@ org.kie.kogito kogito-quarkus-extension - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-quarkus-deployment diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/pom.xml b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/pom.xml index 67aec358b30..a685537af25 100644 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/pom.xml +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/pom.xml @@ -27,7 +27,7 @@ org.kie.kogito kogito-quarkus-extension - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-quarkus-integration-test-maven-devmode diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/src/main/java/control/RestControl.java b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/src/main/java/control/RestControl.java index 3fb44ee20c0..2e0a9279f2f 100644 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/src/main/java/control/RestControl.java +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/src/main/java/control/RestControl.java @@ -18,11 +18,11 @@ */ package control; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import java.util.UUID; @Path("/control") diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/src/main/java/control/RestControl.java b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/src/main/java/control/RestControl.java index 3fb44ee20c0..2e0a9279f2f 100644 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/src/main/java/control/RestControl.java +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/src/main/java/control/RestControl.java @@ -18,11 +18,11 @@ */ package control; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import java.util.UUID; @Path("/control") diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/pom.xml b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/pom.xml index 83848b15f59..cb6067b8105 100644 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/pom.xml +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/pom.xml @@ -27,7 +27,7 @@ org.kie.kogito kogito-quarkus-extension - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-quarkus-integration-test diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/main/java/io/quarkus/it/kogito/jbpm/CalculationService.java b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/main/java/io/quarkus/it/kogito/jbpm/CalculationService.java index cb8d547dba7..2d90b5f644d 100644 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/main/java/io/quarkus/it/kogito/jbpm/CalculationService.java +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/main/java/io/quarkus/it/kogito/jbpm/CalculationService.java @@ -21,7 +21,7 @@ import java.security.SecureRandom; import java.util.Random; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class CalculationService { diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java index 1d5033a13c4..5b92a769773 100644 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java @@ -21,9 +21,6 @@ import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Named; - import org.junit.jupiter.api.Test; import org.kie.kogito.Model; import org.kie.kogito.internal.process.runtime.KogitoProcessInstance; @@ -32,6 +29,9 @@ import io.quarkus.test.junit.QuarkusTest; +import jakarta.inject.Inject; +import jakarta.inject.Named; + import static org.junit.jupiter.api.Assertions.assertEquals; @QuarkusTest diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml index bd42c3e73b9..6ab9d76f534 100644 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml @@ -27,7 +27,7 @@ org.kie.kogito kogito-quarkus-extension - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-quarkus @@ -70,7 +70,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/src/main/resources/META-INF/quarkus-extension.yaml index 39edd05f170..fafe7f55518 100644 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/src/main/resources/META-INF/quarkus-extension.yaml @@ -28,6 +28,6 @@ metadata: - "rules" - "decisions" - "DMN" - guide: "https://quarkus.io/version/2.13/guides/kogito" + guide: "https://quarkus.io/guides/kogito" categories: - "business-automation" diff --git a/quarkus/extensions/kogito-quarkus-extension/pom.xml b/quarkus/extensions/kogito-quarkus-extension/pom.xml index cd9ce87a1b2..6246d797a9d 100644 --- a/quarkus/extensions/kogito-quarkus-extension/pom.xml +++ b/quarkus/extensions/kogito-quarkus-extension/pom.xml @@ -25,7 +25,7 @@ quarkus-extensions org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/kogito-quarkus-incubation-common/pom.xml b/quarkus/extensions/kogito-quarkus-incubation-common/pom.xml index ca013113943..e48988522c4 100644 --- a/quarkus/extensions/kogito-quarkus-incubation-common/pom.xml +++ b/quarkus/extensions/kogito-quarkus-incubation-common/pom.xml @@ -25,7 +25,7 @@ quarkus-extensions org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -55,7 +55,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java index 6d4ee21f09f..b9dbb7e77eb 100644 --- a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java +++ b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java @@ -18,13 +18,13 @@ */ package org.kie.kogito.incubation.application.quarkus; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import org.kie.kogito.incubation.application.AppRoot; import org.kie.kogito.incubation.common.ComponentRoot; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; + @ApplicationScoped public class QuarkusAppRoot extends AppRoot { @Inject @@ -38,4 +38,4 @@ public class QuarkusAppRoot extends AppRoot { public T get(Class providerId) { return componentRoots.select(providerId).get(); } -} \ No newline at end of file +} diff --git a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java index ca4a9c9527e..1e6e245afca 100644 --- a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java +++ b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java @@ -20,8 +20,6 @@ import java.util.Map; -import javax.enterprise.inject.spi.CDI; - import org.kie.kogito.incubation.common.DataContext; import org.kie.kogito.incubation.common.ExtendedDataContext; import org.kie.kogito.incubation.common.MapDataContext; @@ -30,6 +28,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.enterprise.inject.spi.CDI; + /** * This class bridges CDI to non-CDI classes by using CDI.current().select() */ diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-deployment/pom.xml b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-deployment/pom.xml index 0a5b9ef0892..f6e639648d1 100644 --- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-deployment/pom.xml +++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-deployment/pom.xml @@ -25,7 +25,7 @@ kogito-quarkus-predictions-extension org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/pom.xml b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/pom.xml index 70e9511092e..ac4c67662a5 100644 --- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/pom.xml +++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/pom.xml @@ -25,7 +25,7 @@ kogito-quarkus-predictions-extension org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java index 4ab172fe531..5cae3b7a657 100644 --- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java +++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java @@ -20,19 +20,19 @@ import java.util.Map; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import org.kie.kogito.incubation.application.AppRoot; import org.kie.kogito.incubation.common.DataContext; import org.kie.kogito.incubation.common.MapDataContext; import org.kie.kogito.incubation.predictions.PredictionIds; import org.kie.kogito.incubation.predictions.services.PredictionService; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; + @Path("/custom") public class CustomEndpoint { @@ -51,4 +51,4 @@ public DataContext hello(Map payload) { return svc.evaluate(id, MapDataContext.from(payload)); } -} \ No newline at end of file +} diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/pom.xml b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/pom.xml index ee2a6758549..c3b0a881081 100644 --- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/pom.xml +++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/pom.xml @@ -25,7 +25,7 @@ kogito-quarkus-predictions-extension org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -62,7 +62,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} @@ -93,7 +93,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java index b3e0792efae..303535ab954 100644 --- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java +++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java @@ -18,10 +18,10 @@ */ package org.kie.kogito.core.prediction.incubation.quarkus.support; -import javax.enterprise.context.ApplicationScoped; - import org.kie.kogito.incubation.predictions.PredictionIds; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped class QuarkusPredictionIds extends PredictionIds { } diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java index ed5b13d9803..f0d3faeef18 100644 --- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java +++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java @@ -18,17 +18,17 @@ */ package org.kie.kogito.core.prediction.incubation.quarkus.support; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import org.kie.kogito.incubation.common.DataContext; import org.kie.kogito.incubation.common.ExtendedDataContext; import org.kie.kogito.incubation.common.LocalId; import org.kie.kogito.incubation.predictions.services.PredictionService; import org.kie.kogito.prediction.PredictionModels; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; + @ApplicationScoped public class QuarkusPredictionService implements PredictionService { @Inject diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/resources/META-INF/quarkus-extension.yaml index 4a84139fc30..bacc5000fa8 100644 --- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/resources/META-INF/quarkus-extension.yaml @@ -25,6 +25,6 @@ metadata: - "drools" - "predictions" - "PMML" - guide: "https://quarkus.io/version/2.13/guides/kogito-pmml" + guide: "https://quarkus.io/guides/kogito-pmml" categories: - "business-automation" diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/pom.xml b/quarkus/extensions/kogito-quarkus-predictions-extension/pom.xml index cb1ffb0d9a5..7bc7b21d3da 100644 --- a/quarkus/extensions/kogito-quarkus-predictions-extension/pom.xml +++ b/quarkus/extensions/kogito-quarkus-predictions-extension/pom.xml @@ -25,7 +25,7 @@ quarkus-extensions org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-deployment/pom.xml b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-deployment/pom.xml index 92c95d93e42..9b74a01a659 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-deployment/pom.xml +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-deployment/pom.xml @@ -25,7 +25,7 @@ kogito-quarkus-processes-extension org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/pom.xml b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/pom.xml index 9f9a5081af5..49948f77a06 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/pom.xml +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/pom.xml @@ -27,7 +27,7 @@ org.kie.kogito kogito-quarkus-processes-extension - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-quarkus-processes-integration-test-hot-reload diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/src/test/java/io/quarkus/it/kogito/process/HotReloadTestHelper.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/src/test/java/io/quarkus/it/kogito/process/HotReloadTestHelper.java index 41d5b44612c..4b3aad3e64c 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/src/test/java/io/quarkus/it/kogito/process/HotReloadTestHelper.java +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/src/test/java/io/quarkus/it/kogito/process/HotReloadTestHelper.java @@ -18,7 +18,7 @@ */ package io.quarkus.it.kogito.process; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; /** * HotReloadTestHelper diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/pom.xml b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/pom.xml index 2f25caf8c37..8ebdae13f44 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/pom.xml +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/pom.xml @@ -27,7 +27,7 @@ org.kie.kogito kogito-quarkus-processes-extension - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-quarkus-processes-integration-test diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java index 608707a960c..2fe0982edc8 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java @@ -20,16 +20,6 @@ import java.util.Map; -import javax.inject.Inject; -import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import org.kie.kogito.Model; import org.kie.kogito.incubation.application.AppRoot; import org.kie.kogito.incubation.common.DataContext; @@ -38,6 +28,16 @@ import org.kie.kogito.incubation.processes.services.StraightThroughProcessService; import org.kie.kogito.process.Process; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + @Path("/hello") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) @@ -65,4 +65,4 @@ public Response version() { return Response.ok(Map.of("version", approvalProcess.version())).build(); } -} \ No newline at end of file +} diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java index 3af88368d9d..87625b9c092 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java @@ -21,8 +21,6 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; - import org.junit.jupiter.api.Test; import org.kie.kogito.incubation.application.AppRoot; import org.kie.kogito.incubation.common.*; @@ -40,6 +38,8 @@ import io.quarkus.test.junit.QuarkusTest; +import jakarta.inject.Inject; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/pom.xml b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/pom.xml index ca1a41e5056..4d5390543c5 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/pom.xml +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/pom.xml @@ -25,7 +25,7 @@ kogito-quarkus-processes-extension org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -60,7 +60,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java index 041d0992e59..d1e07cbe397 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java @@ -18,11 +18,6 @@ */ package org.kie.kogito.core.process.incubation.quarkus.support; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import org.kie.kogito.Application; import org.kie.kogito.incubation.common.DataContext; import org.kie.kogito.incubation.common.ExtendedDataContext; @@ -32,6 +27,11 @@ import org.kie.kogito.process.Processes; import org.kie.kogito.process.impl.ProcessServiceImpl; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; + @ApplicationScoped public class QuarkusHumanTaskService implements HumanTaskService { @Inject diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java index 7ea23a236f5..9ee4e8e45c4 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java @@ -18,10 +18,10 @@ */ package org.kie.kogito.core.process.incubation.quarkus.support; -import javax.enterprise.context.ApplicationScoped; - import org.kie.kogito.incubation.processes.ProcessIds; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped public class QuarkusProcessIdFactory extends ProcessIds { diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java index 2e40f0f8809..201dc8c16e3 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java @@ -18,11 +18,6 @@ */ package org.kie.kogito.core.process.incubation.quarkus.support; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import org.kie.kogito.Application; import org.kie.kogito.incubation.common.DataContext; import org.kie.kogito.incubation.common.ExtendedDataContext; @@ -31,6 +26,11 @@ import org.kie.kogito.process.Processes; import org.kie.kogito.process.impl.ProcessServiceImpl; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; + @ApplicationScoped public class QuarkusStatefulProcessService implements StatefulProcessService { @Inject diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java index 3f009c55792..bb776f94448 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java @@ -18,16 +18,16 @@ */ package org.kie.kogito.core.process.incubation.quarkus.support; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import org.kie.kogito.incubation.common.DataContext; import org.kie.kogito.incubation.common.Id; import org.kie.kogito.incubation.processes.services.StraightThroughProcessService; import org.kie.kogito.process.Processes; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; + @ApplicationScoped public class QuarkusStraightThroughProcessService implements StraightThroughProcessService { @Inject diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/resources/META-INF/quarkus-extension.yaml index 7b934adb583..c965648c3d8 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/resources/META-INF/quarkus-extension.yaml @@ -27,6 +27,6 @@ metadata: - "bpm" - "bpmn" - "BPMN2" - guide: "https://quarkus.io/version/2.13/guides/kogito" + guide: "https://quarkus.io/guides/kogito" categories: - "business-automation" diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/pom.xml b/quarkus/extensions/kogito-quarkus-processes-extension/pom.xml index aada7cd2f4b..fb440832e04 100644 --- a/quarkus/extensions/kogito-quarkus-processes-extension/pom.xml +++ b/quarkus/extensions/kogito-quarkus-processes-extension/pom.xml @@ -25,7 +25,7 @@ quarkus-extensions org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-deployment/pom.xml b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-deployment/pom.xml index 3aea641f4f4..7951aab3d74 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-deployment/pom.xml +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-deployment/pom.xml @@ -25,7 +25,7 @@ kogito-quarkus-rules-extension org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test-hot-reload/pom.xml b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test-hot-reload/pom.xml index 06e2dbad95b..6388e8ccb6b 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test-hot-reload/pom.xml +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test-hot-reload/pom.xml @@ -25,7 +25,7 @@ kogito-quarkus-rules-extension org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/pom.xml b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/pom.xml index a433fa1bd24..1df95198802 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/pom.xml +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/pom.xml @@ -25,7 +25,7 @@ kogito-quarkus-rules-extension org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java index 66a42383c3f..403b60fda4f 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java @@ -18,15 +18,15 @@ */ package org.kie.kogito.quarkus.drools; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.drools.ruleunits.api.DataStore; import org.drools.ruleunits.api.RuleUnitData; import org.kie.kogito.incubation.common.ReferenceContext; import io.quarkus.arc.Unremovable; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped @Unremovable // temporary workaround to allow injecting RuleUnitInstance // without injecting AnotherService directly (otherwise Quarkus ArC will ignore this) diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java index c249f1faf01..10c813280bc 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java @@ -21,19 +21,19 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import org.kie.kogito.incubation.application.AppRoot; import org.kie.kogito.incubation.common.DataContext; import org.kie.kogito.incubation.common.MapDataContext; import org.kie.kogito.incubation.rules.RuleUnitIds; import org.kie.kogito.incubation.rules.services.RuleUnitService; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; + @Path("/custom") public class CustomEndpoint { diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java index 21ea877b5d1..a68e57d8810 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java @@ -20,8 +20,6 @@ import java.util.Map; -import javax.inject.Inject; - import org.junit.jupiter.api.Test; import org.kie.kogito.incubation.common.EmptyDataContext; import org.kie.kogito.incubation.common.ExtendedDataContext; @@ -34,6 +32,8 @@ import io.quarkus.test.junit.QuarkusTest; +import jakarta.inject.Inject; + import static org.junit.jupiter.api.Assertions.assertEquals; @QuarkusTest diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java index a9e445e1b87..8347135d1dd 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java @@ -22,8 +22,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; - import org.drools.ruleunits.api.DataSource; import org.junit.jupiter.api.Test; import org.kie.kogito.incubation.application.AppRoot; @@ -42,6 +40,8 @@ import io.quarkus.test.junit.QuarkusTest; +import jakarta.inject.Inject; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml index 7f8290145d4..8b391701927 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml @@ -25,7 +25,7 @@ kogito-quarkus-rules-extension org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -65,7 +65,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} @@ -96,7 +96,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java index 20991fef11a..d2b144a6e3d 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java @@ -18,13 +18,13 @@ */ package org.kie.kogito.core.rules.incubation.quarkus.support; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; - import org.drools.ruleunits.api.DataSource; import org.drools.ruleunits.api.DataStore; import org.drools.ruleunits.api.DataStream; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; + @ApplicationScoped public class DataSourceProvider { @Produces diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java index d4e780492e6..3b23e587766 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java @@ -18,17 +18,17 @@ */ package org.kie.kogito.core.rules.incubation.quarkus.support; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import org.kie.kogito.incubation.common.DataContext; import org.kie.kogito.incubation.common.LocalId; import org.kie.kogito.incubation.rules.data.DataId; import org.kie.kogito.incubation.rules.services.DataSourceService; import org.kie.kogito.rules.RuleUnits; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; + @ApplicationScoped public class QuarkusDataSourceService implements DataSourceService { @Inject diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java index 8fd6c241466..3b190b39ffb 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java @@ -18,10 +18,10 @@ */ package org.kie.kogito.core.rules.incubation.quarkus.support; -import javax.enterprise.context.ApplicationScoped; - import org.kie.kogito.incubation.rules.RuleUnitIds; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped class QuarkusRuleUnitIdFactory extends RuleUnitIds { } diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java index 80368286a20..bfd1eb27762 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java @@ -20,16 +20,16 @@ import java.util.stream.Stream; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import org.drools.ruleunits.api.RuleUnits; import org.kie.kogito.incubation.common.DataContext; import org.kie.kogito.incubation.common.Id; import org.kie.kogito.incubation.rules.services.RuleUnitService; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; + @ApplicationScoped public class QuarkusRuleUnitService implements RuleUnitService { diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java index 842cb11c735..10b23577d8e 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java @@ -20,11 +20,6 @@ import java.util.stream.Stream; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import org.kie.kogito.incubation.common.ExtendedDataContext; import org.kie.kogito.incubation.common.ExtendedReferenceContext; import org.kie.kogito.incubation.common.LocalId; @@ -32,6 +27,11 @@ import org.kie.kogito.incubation.rules.services.StatefulRuleUnitService; import org.kie.kogito.rules.RuleUnits; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; + @ApplicationScoped public class QuarkusStatefulRuleUnitService implements StatefulRuleUnitService { @Inject diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java index e5bb3dd4877..45945048c27 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java @@ -18,12 +18,12 @@ */ package org.kie.kogito.core.rules.incubation.quarkus.support; -import javax.enterprise.context.ApplicationScoped; - import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.jackson.ObjectMapperCustomizer; +import jakarta.enterprise.context.ApplicationScoped; + /** * Wraps and configures a custom ObjectMapper for DataSources */ diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/resources/META-INF/quarkus-extension.yaml index f38dab62801..70d98bba1de 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/resources/META-INF/quarkus-extension.yaml @@ -25,6 +25,6 @@ metadata: - "drools" - "rules" - "DRL" - guide: "https://quarkus.io/version/2.13/guides/kogito-drl" + guide: "https://quarkus.io/guides/kogito-drl" categories: - "business-automation" diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/pom.xml b/quarkus/extensions/kogito-quarkus-rules-extension/pom.xml index 57adaf16eeb..921bee71dc1 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/pom.xml +++ b/quarkus/extensions/kogito-quarkus-rules-extension/pom.xml @@ -25,7 +25,7 @@ quarkus-extensions org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml index 5946e670809..5a219293679 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml @@ -25,7 +25,7 @@ kogito-quarkus-serverless-workflow-extension org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 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 73f2ecc13bc..8a7edf87368 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 @@ -27,9 +27,9 @@ 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 ba1fa4ba9bb..550fb9d1285 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 @@ -30,8 +30,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; - import org.drools.codegen.common.GeneratedFile; import org.drools.codegen.common.GeneratedFileType; import org.drools.quarkus.util.deployment.DroolsQuarkusResourceUtils; @@ -67,6 +65,8 @@ import io.quarkus.runtime.configuration.ConfigUtils; import io.quarkus.runtime.configuration.QuarkusConfigFactory; +import jakarta.inject.Inject; + /** * This class adds live reload support for {@link io.quarkus.deployment.CodeGenProvider} objects. */ 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 f502b34a834..214abfcd260 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 @@ -22,14 +22,12 @@ import java.util.Map; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.core.Response; - import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.MethodInfo; import org.jboss.jandex.Type; +import org.jboss.jandex.VoidType; import org.kie.kogito.codegen.api.context.KogitoBuildContext; import org.kie.kogito.quarkus.serverless.workflow.ClassAnnotatedWorkflowHandlerGenerator; import org.kie.kogito.quarkus.serverless.workflow.WorkflowCodeGenUtils; @@ -55,6 +53,9 @@ import io.quarkiverse.openapi.generator.annotations.GeneratedMethod; import io.quarkiverse.openapi.generator.annotations.GeneratedParam; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.core.Response; + import static com.github.javaparser.StaticJavaParser.parseClassOrInterfaceType; public class WorkflowOpenApiHandlerGenerator extends ClassAnnotatedWorkflowHandlerGenerator { @@ -91,7 +92,7 @@ private WorkflowHandlerGeneratedFile generateHandler(KogitoBuildContext context, BlockStmt body = executeMethod.createBody(); MethodCallExpr methodCallExpr = new MethodCallExpr(new NameExpr(OPEN_API_REF), m.name()); final NameExpr parameters = new NameExpr(WORK_ITEM_PARAMETERS); - if (m.returnType().name().equals(DotName.createSimple(Response.class.getName()))) { + if (m.returnType().name().equals(DotName.createSimple(Response.class.getName())) || (m.returnType() instanceof VoidType)) { body.addStatement(methodCallExpr).addStatement(new ReturnStmt(new NullLiteralExpr())); } else { body.addStatement(new ReturnStmt(methodCallExpr)); diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java index 37127f06043..cad673ba39a 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java @@ -22,9 +22,6 @@ import java.util.Collections; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.jandex.IndexView; import org.kie.kogito.codegen.api.context.KogitoBuildContext; @@ -49,6 +46,9 @@ import io.grpc.Channel; import io.quarkus.grpc.GrpcClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + import static com.github.javaparser.StaticJavaParser.parseClassOrInterfaceType; public class WorkflowRPCHandlerGenerator implements WorkflowHandlerGenerator { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java index 30a50a9eef1..310dedb1d6b 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java @@ -21,13 +21,13 @@ import java.net.URI; import java.util.function.Function; -import javax.annotation.PostConstruct; -import javax.inject.Inject; - import io.quarkus.cache.Cache; import io.quarkus.cache.CacheName; import io.quarkus.runtime.Startup; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; + @Startup public class QuarkusResourceCache { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/pom.xml index 5c19fb15fc7..117aa01522a 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/pom.xml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-quarkus-serverless-workflow-extension - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-quarkus-serverless-workflow-extension-live-reload-test diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/src/main/resources/application.properties b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/src/main/resources/application.properties new file mode 100644 index 00000000000..d8481d844b2 --- /dev/null +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/src/main/resources/application.properties @@ -0,0 +1 @@ +quarkus.smallrye-openapi.management.enabled=true \ No newline at end of file diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/src/test/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessorTest.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/src/test/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessorTest.java index 5835303e128..30785859d07 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/src/test/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessorTest.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/src/test/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessorTest.java @@ -94,7 +94,8 @@ private static String applicationProperties(String wireMockBaseUrl) { "quarkus.grpc.clients.Greeter.port=" + PORT, "quarkus.grpc.server.port=" + PORT, "quarkus.grpc.server.test-port=" + PORT, - "quarkus.devservices.enabled=false") + "quarkus.devservices.enabled=false", + "quarkus.smallrye-openapi.management.enabled=true") .collect(Collectors.joining(System.lineSeparator())); } diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-image-integration-test/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-image-integration-test/pom.xml index 79383388c24..dc62560ead4 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-image-integration-test/pom.xml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-image-integration-test/pom.xml @@ -25,7 +25,7 @@ kogito-quarkus-serverless-workflow-extension org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml index 747039445b0..2b0c1e1cebc 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml @@ -5,7 +5,7 @@ kogito-quarkus-serverless-workflow-extension org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -54,6 +54,10 @@ io.quarkus quarkus-jdbc-postgresql + + io.quarkus + quarkus-grpc-codegen + org.kie.kogito @@ -202,6 +206,28 @@ + + + org.codehaus.mojo + exec-maven-plugin + + + post-process-grpc + generate-sources + + java + + + false + true + + ${project.build.directory}/generated-sources/grpc + + io.quarkus.grpc.deployment.GrpcPostProcessing + + + + io.quarkus quarkus-maven-plugin diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/AgePersonService.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/AgePersonService.java index 38415e9b460..91a4f9e9100 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/AgePersonService.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/AgePersonService.java @@ -20,7 +20,7 @@ import java.util.Date; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class AgePersonService { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/EvenService.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/EvenService.java index 10bcefb6421..13f31b359ca 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/EvenService.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/EvenService.java @@ -18,7 +18,7 @@ */ package org.kie.kogito.workflows.services; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class EvenService { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java index 838f60172b1..9f97d68aeac 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java @@ -20,17 +20,17 @@ import java.util.Map; -import javax.inject.Inject; -import javax.inject.Named; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import org.kie.kogito.Model; import org.kie.kogito.process.Process; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + @Path("/greetdetails") public class GreetResource { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java index d9175ba155f..0331552e795 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java @@ -18,16 +18,16 @@ */ package org.kie.kogito.workflows.services; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Named; - import org.kie.kogito.addon.quarkus.messaging.common.ChannelFormat; import org.kie.kogito.event.CloudEventUnmarshallerFactory; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Named; + @ApplicationScoped public class JavaSerializationProducer { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java index abe000d6f7f..26e6c0e98d6 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java @@ -18,12 +18,12 @@ */ package org.kie.kogito.workflows.services; -import javax.enterprise.context.ApplicationScoped; - import org.kie.api.event.process.ProcessNodeLeftEvent; import org.kie.kogito.internal.process.event.DefaultKogitoProcessEventListener; import org.kie.kogito.internal.process.runtime.KogitoNodeInstance; +import jakarta.enterprise.context.ApplicationScoped; + import static java.lang.String.format; @ApplicationScoped diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/PersonService.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/PersonService.java index 7011b3f04f1..36197c02326 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/PersonService.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/PersonService.java @@ -18,7 +18,7 @@ */ package org.kie.kogito.workflows.services; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class PersonService { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java index 942c0709d87..b49a2765081 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java @@ -20,11 +20,11 @@ import java.util.Map; -import javax.enterprise.context.ApplicationScoped; - import org.kie.kogito.internal.process.runtime.KogitoWorkItem; import org.kie.kogito.serverless.workflow.WorkflowWorkItemHandler; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped public class RPCCustomWorkItemHandler extends WorkflowWorkItemHandler { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java index 40748ec9fb1..317cb162790 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java @@ -18,12 +18,12 @@ */ package org.kie.kogito.workflows.services; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.kie.kogito.process.impl.CachedWorkItemHandlerConfig; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped public class RPCCustomWorkItemHandlerConfig extends CachedWorkItemHandlerConfig { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/SquareService.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/SquareService.java index 4a93f89081e..f72348a5107 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/SquareService.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/SquareService.java @@ -21,7 +21,7 @@ import java.util.Collection; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class SquareService { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/callback-state-with-timeouts-error-handler.sw.json b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/callback-state-with-timeouts-error-handler.sw.json index eb5508c0ff5..de849da2d9e 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/callback-state-with-timeouts-error-handler.sw.json +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/callback-state-with-timeouts-error-handler.sw.json @@ -37,7 +37,7 @@ { "name": "publishTimeoutExpired", "type": "asyncapi", - "operation": "specs/callbackResults.yaml#sendTimeoutExpired" + "operation": "specs/callbackResults.yaml#sendTimeoutExpiredForCallbackError" }, { "name": "publishFailure", diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/eventWithError.sw.json b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/eventWithError.sw.json index b9e84b6d972..c854ebb8a4e 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/eventWithError.sw.json +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/eventWithError.sw.json @@ -27,7 +27,7 @@ { "name": "publishTimeoutExpired", "type": "asyncapi", - "operation": "specs/callbackResults.yaml#sendTimeoutExpired" + "operation": "specs/callbackResults.yaml#sendTimeoutExpiredError" } ] , diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/specs/callbackResults.yaml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/specs/callbackResults.yaml index d5b962c7c76..a50a2bd9ede 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/specs/callbackResults.yaml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/specs/callbackResults.yaml @@ -21,10 +21,17 @@ channels: summary: Success message: $ref: '#/components/messages/message' - timeout: - description: A message channel for expired timeouts + timeoutCallbackError: + description: A message channel for callback timeout error publish: - operationId: sendTimeoutExpired + operationId: sendTimeoutExpiredForCallbackError + summary: Timeout Expired + message: + $ref: '#/components/messages/message' + timeoutError: + description: A message channel for timeout error + publish: + operationId: sendTimeoutExpiredError summary: Timeout Expired message: $ref: '#/components/messages/message' diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/token-propagation.sw.json b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/token-propagation.sw.json index b637610c691..190eb1fcca6 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/token-propagation.sw.json +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/token-propagation.sw.json @@ -7,7 +7,7 @@ "errors": [ { "name": "execution_error", - "code": "javax.ws.rs.ProcessingException" + "code": "jakarta.ws.rs.ProcessingException" } ], "functions": [ diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/CallbackStateWithTimeoutsErrorHandlerIT.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/CallbackStateWithTimeoutsErrorHandlerIT.java index 0c166769adb..658e2b8ac53 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/CallbackStateWithTimeoutsErrorHandlerIT.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/CallbackStateWithTimeoutsErrorHandlerIT.java @@ -70,7 +70,7 @@ void callbackStateTimeoutsExceeded() throws Exception { assertProcessInstanceExists(CALLBACK_STATE_TIMEOUTS_GET_BY_ID_URL, processInstanceId); assertProcessInstanceHasFinished(CALLBACK_STATE_TIMEOUTS_GET_BY_ID_URL, processInstanceId, 1, 10); - waitForFinalizedEvent(processInstanceId, "timeout"); + waitForFinalizedEvent(processInstanceId, "timeoutCallbackError"); } @Test diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/EventTimedoutIT.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/EventTimedoutIT.java index 292fbcab110..544b016549d 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/EventTimedoutIT.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/EventTimedoutIT.java @@ -80,7 +80,7 @@ void testTimedout() throws InterruptedException { String id = startProcess("eventTimedout"); Converter converter = new ByteArrayCloudEventUnmarshallerFactory(objectMapper).unmarshaller(Map.class).cloudEvent(); final CountDownLatch countDownLatch = new CountDownLatch(1); - kafkaClient.consume("timeout", v -> { + kafkaClient.consume("timeoutError", v -> { try { CloudEvent event = converter.convert(v); if (id.equals(event.getExtension(CloudEventExtensionConstants.PROCESS_INSTANCE_ID))) { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ExternalServiceMock.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ExternalServiceMock.java index 007127ec483..7ffa1481b7f 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ExternalServiceMock.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ExternalServiceMock.java @@ -33,8 +33,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; public class ExternalServiceMock implements QuarkusTestResourceLifecycleManager { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ForEachRestIT.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ForEachRestIT.java index 71220c7bcbf..03c83ac5c32 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ForEachRestIT.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ForEachRestIT.java @@ -56,7 +56,7 @@ void testForEachSubflow() { given() .contentType(ContentType.JSON) .accept(ContentType.JSON) - .body("{\"numbers\" : [1,2,3,4,5], \"constant\": 2}}").when() + .body("{\"numbers\" : [1,2,3,4,5], \"constant\": 2}").when() .post("/foreach_parent") .then() .statusCode(201) diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/KeycloakServiceMock.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/KeycloakServiceMock.java index 5bd6325ac35..67d3d66bcc4 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/KeycloakServiceMock.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/KeycloakServiceMock.java @@ -31,9 +31,9 @@ import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; /** * Lightweight Keycloak mock to use when an OidcClient is required, and we don't want/need to start a full Keycloak diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java index 93f7844f2b6..57ab33832da 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java @@ -21,14 +21,14 @@ import java.time.Duration; import java.util.UUID; -import javax.ws.rs.core.MediaType; - import org.junit.jupiter.api.Test; import io.quarkus.test.junit.QuarkusIntegrationTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; +import jakarta.ws.rs.core.MediaType; + import static io.restassured.RestAssured.given; import static org.awaitility.Awaitility.await; import static org.hamcrest.CoreMatchers.is; diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java index 0802aed3d1d..acc2c88be55 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java @@ -21,20 +21,20 @@ import java.util.Collections; import java.util.Map; -import javax.ws.rs.core.HttpHeaders; - import com.github.tomakehurst.wiremock.WireMockServer; import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; +import jakarta.ws.rs.core.HttpHeaders; + import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.configureFor; import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.kie.kogito.quarkus.workflows.KeycloakServiceMock.KEYCLOAK_ACCESS_TOKEN; public class TokenPropagationExternalServicesMock implements QuarkusTestResourceLifecycleManager { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java index 12c7faa5b65..174ce0c6ebf 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java @@ -21,8 +21,6 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.HttpHeaders; - import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; @@ -30,6 +28,8 @@ import io.quarkus.test.junit.QuarkusIntegrationTest; import io.restassured.path.json.JsonPath; +import jakarta.ws.rs.core.HttpHeaders; + import static org.kie.kogito.quarkus.workflows.ExternalServiceMock.SUCCESSFUL_QUERY; import static org.kie.kogito.quarkus.workflows.TokenPropagationExternalServicesMock.AUTHORIZATION_TOKEN; import static org.kie.kogito.quarkus.workflows.TokenPropagationExternalServicesMock.SERVICE3_AUTHORIZATION_TOKEN; diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/WorkflowEventIT.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/WorkflowEventIT.java index a21b62e08ee..c11109b5d8a 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/WorkflowEventIT.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/WorkflowEventIT.java @@ -87,7 +87,7 @@ void testWorkflowEvents() throws Exception { String password = "buddy"; kafkaClient.consume(Set.of(EventPublisher.PROCESS_INSTANCES_TOPIC_NAME), s -> { - LOGGER.info("Received from kafka: {}", s); + LOGGER.debug("Received from kafka: {}", s); try { ProcessInstanceDataEvent event = mapper.readValue(s, ProcessInstanceDataEvent.class); Map data = (Map) event.getData(); diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml index 2f0c60b6878..dcea5feffa2 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml @@ -5,7 +5,7 @@ kogito-quarkus-serverless-workflow-extension org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -143,7 +143,7 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${version.io.quarkus} diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/README.tpl.qute.md b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/README.tpl.qute.md index 5a6afd82f90..f15cc96ff38 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/README.tpl.qute.md +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/README.tpl.qute.md @@ -1,7 +1,7 @@ {#include readme-header /} -This Kogito Serverless Workflow project contains a sample workflow definition as described in the [Quarkus Kogito guide](https://quarkus.io/version/2.13/guides/kogito). +This Kogito Serverless Workflow project contains a sample workflow definition as described in the [Quarkus Kogito guide](https://quarkus.io/guides/kogito). The goal is to showcase automatic REST endpoint codegen, based on the content of the model. The `greet.sw.json` workflow will greet users in different languages based on the input. -You can reference the [full guide on the Quarkus website](https://quarkus.io/version/2.13/guides/kogito). +You can reference the [full guide on the Quarkus website](https://quarkus.io/guides/kogito). diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/codestart.yml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/codestart.yml index e8678aaeb21..774a2e22373 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/codestart.yml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/codestart.yml @@ -5,7 +5,7 @@ tags: extension-codestart metadata: title: Kogito Serverless Workflow codestart description: This is an example Kogito Serverless Workflow Quarkus codestart, it contains a sample Serverless Workflow definition for REST code generation. - related-guide-section: https://quarkus.io/version/2.13/guides/kogito + related-guide-section: https://quarkus.io/guides/kogito language: base: dependencies: diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java index 9070b5e9225..90b12060459 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java @@ -18,11 +18,10 @@ */ package org.kie.kogito.expr.jq; -import javax.annotation.PostConstruct; -import javax.inject.Inject; - import io.quarkus.runtime.Startup; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import net.thisptr.jackson.jq.Scope; @Startup diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java index 9fa0551c109..11a8efaf0e4 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java @@ -18,12 +18,12 @@ */ package org.kie.kogito.secret; -import javax.annotation.PostConstruct; - import org.kie.kogito.serverless.workflow.utils.ConfigResolverHolder; import io.quarkus.runtime.Startup; +import jakarta.annotation.PostConstruct; + @Startup public class QuarkusConfigResolverRegister { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java index 54c0614393f..090787ade4c 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java @@ -18,16 +18,16 @@ */ package org.kie.kogito.serverless.workflow.config; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig; import org.kie.kogito.serverless.workflow.WorkflowWorkItemHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; + @ApplicationScoped public class ServerlessWorkflowWorkItemHandlerConfig extends DefaultWorkItemHandlerConfig { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java index d07051612e1..582bbe7ce90 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java @@ -18,14 +18,14 @@ */ package org.kie.kogito.serverless.workflow.mapper; -import javax.enterprise.context.ApplicationScoped; - import org.kie.kogito.jackson.utils.JsonNodeFactoryListener; import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.jackson.ObjectMapperCustomizer; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped public class ObjectMapperConfig implements ObjectMapperCustomizer { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java index 6ef78bbf197..e8c97f413da 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java @@ -23,10 +23,6 @@ import java.util.Collections; import java.util.Map; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; - import org.kie.kogito.event.cloudevents.extension.ProcessMeta; import org.kie.kogito.internal.process.runtime.KogitoWorkItem; import org.kie.kogito.process.workitem.WorkItemExecutionException; @@ -34,6 +30,10 @@ import io.quarkus.restclient.runtime.RestClientBuilderFactory; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; + public abstract class OpenApiWorkItemHandler extends WorkflowWorkItemHandler { @Override diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/resources/META-INF/quarkus-extension.yaml index 1fa30d99a1b..d0ae242db9b 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/resources/META-INF/quarkus-extension.yaml @@ -7,7 +7,7 @@ metadata: - "serverless" - "workflow" - "SW" - guide: "https://quarkus.io/version/2.13/guides/kogito" + guide: "https://quarkus.io/guides/kogito" categories: - "business-automation" status: "preview" diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/pom.xml index 06bd28fd397..38616b206f9 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/pom.xml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/pom.xml @@ -25,7 +25,7 @@ quarkus-extensions org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/kogito-quarkus-test-list/pom.xml b/quarkus/extensions/kogito-quarkus-test-list/pom.xml index acb8abed76d..2870d3890f7 100644 --- a/quarkus/extensions/kogito-quarkus-test-list/pom.xml +++ b/quarkus/extensions/kogito-quarkus-test-list/pom.xml @@ -25,7 +25,7 @@ quarkus-extensions org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common-deployment/pom.xml b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common-deployment/pom.xml index 8a09007379e..6e70a8be85b 100644 --- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common-deployment/pom.xml +++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common-deployment/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-quarkus-workflow-extension-common - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-quarkus-workflow-common-deployment diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/pom.xml b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/pom.xml index d0d7cd6141b..73d2bbb777c 100644 --- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/pom.xml +++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-quarkus-workflow-extension-common - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-quarkus-workflow-common @@ -54,7 +54,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java index 26a0a3c8522..ea7fe04f789 100644 --- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java +++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java @@ -20,10 +20,6 @@ import java.util.concurrent.ScheduledExecutorService; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; - import org.kie.kogito.config.ConfigBean; import org.kie.kogito.correlation.CorrelationService; import org.kie.kogito.event.correlation.DefaultCorrelationService; @@ -39,6 +35,10 @@ import io.quarkus.arc.DefaultBean; import io.quarkus.arc.properties.IfBuildProperty; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; + @ApplicationScoped public class KogitoBeanProducer { diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java index bf02d1fa339..5d19387b5e0 100644 --- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java +++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java @@ -21,9 +21,6 @@ import java.util.Collection; import java.util.Optional; -import javax.annotation.PostConstruct; -import javax.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.event.DataEvent; import org.kie.kogito.event.EventPublisher; @@ -34,6 +31,9 @@ import io.vertx.ext.web.client.WebClient; import io.vertx.ext.web.client.predicate.ResponsePredicate; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; + public class DataIndexEventPublisher implements EventPublisher { public static final String KOGITO_DATA_INDEX = "kogito.data-index.url"; diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java index 56552ca660c..e10d867782b 100644 --- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java +++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java @@ -22,14 +22,14 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import org.eclipse.microprofile.context.ThreadContext; import org.kie.kogito.services.jobs.impl.InMemoryJobService; import io.quarkus.arc.DefaultBean; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped @DefaultBean public class QuarkusScheduledExecutorService extends ScheduledThreadPoolExecutor { diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/pom.xml b/quarkus/extensions/kogito-quarkus-workflow-extension-common/pom.xml index 9b7d6e4167a..9b5fb230b58 100644 --- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/pom.xml +++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito quarkus-extensions - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/quarkus/extensions/pom.xml b/quarkus/extensions/pom.xml index ca8c9bb99ed..dbc453d9c05 100644 --- a/quarkus/extensions/pom.xml +++ b/quarkus/extensions/pom.xml @@ -27,7 +27,7 @@ org.kie.kogito quarkus - 2.0.0-SNAPSHOT + 999-SNAPSHOT quarkus-extensions diff --git a/quarkus/integration-tests/integration-tests-kogito-plugin/pom.xml b/quarkus/integration-tests/integration-tests-kogito-plugin/pom.xml index 5f43329c7ed..765a3da2608 100644 --- a/quarkus/integration-tests/integration-tests-kogito-plugin/pom.xml +++ b/quarkus/integration-tests/integration-tests-kogito-plugin/pom.xml @@ -23,7 +23,7 @@ org.kie.kogito kogito-quarkus-integration-tests - 2.0.0-SNAPSHOT + 999-SNAPSHOT integration-tests-kogito-plugin Kogito :: Integration Tests :: Maven Plugin diff --git a/quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/src/test/java/org/acme/travels/PersonProcessTest.java b/quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/src/test/java/org/acme/travels/PersonProcessTest.java index fe93bfc22d1..09baf63f1aa 100644 --- a/quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/src/test/java/org/acme/travels/PersonProcessTest.java +++ b/quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/src/test/java/org/acme/travels/PersonProcessTest.java @@ -26,8 +26,8 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.junit.jupiter.api.Test; import org.kie.kogito.Model; diff --git a/quarkus/integration-tests/integration-tests-quarkus-decisions/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-decisions/pom.xml index 1deacb745ab..4ef731c8f5b 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-decisions/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-decisions/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-quarkus-integration-tests - 2.0.0-SNAPSHOT + 999-SNAPSHOT integration-tests-quarkus-decisions Kogito :: Integration Tests :: Quarkus :: Decisions diff --git a/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java b/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java index 02276572fb6..b0cf4184568 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java +++ b/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java @@ -18,14 +18,14 @@ */ package org.kie.kogito.integrationtests; -import javax.inject.Inject; - import org.kie.kogito.Application; import org.kie.kogito.decision.DecisionConfig; import org.kie.kogito.decision.DecisionModels; import io.quarkus.runtime.Startup; +import jakarta.inject.Inject; + @Startup public class InjectDecisionModels { diff --git a/quarkus/integration-tests/integration-tests-quarkus-gradle/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-gradle/pom.xml index f672a6a25ae..c083cab3a62 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-gradle/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-gradle/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-quarkus-integration-tests - 2.0.0-SNAPSHOT + 999-SNAPSHOT integration-tests-quarkus-gradle Kogito :: Integration Tests :: Quarkus :: Gradle diff --git a/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/pom.xml index ed33bf00458..a52bce96a5f 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-quarkus-integration-tests - 2.0.0-SNAPSHOT + 999-SNAPSHOT integration-tests-quarkus-legacy-rules Kogito :: Integration Tests :: Quarkus :: Legacy Rules diff --git a/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java b/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java index 589908d1d96..2e288d98a75 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java +++ b/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java @@ -21,14 +21,14 @@ import java.util.HashMap; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.*; - import org.kie.api.runtime.KieRuntimeBuilder; import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.FactHandle; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.*; + @Path("/test-tms") public class TmsEndpoint { @Inject diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-norest/pom.xml index c44b99116ed..9acc763f550 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-norest/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-norest/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-quarkus-integration-tests - 2.0.0-SNAPSHOT + 999-SNAPSHOT integration-tests-quarkus-norest Kogito :: Integration Tests :: Quarkus :: Without REST diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java index 4d86f0a465d..be9aa7306ba 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java +++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java @@ -21,8 +21,6 @@ import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; - import org.junit.jupiter.api.Test; import org.kie.dmn.api.core.DMNResult; import org.kie.kogito.decision.DecisionModel; @@ -30,6 +28,8 @@ import io.quarkus.test.junit.QuarkusTest; +import jakarta.inject.Inject; + import static org.assertj.core.api.Assertions.assertThat; @QuarkusTest diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java index 0ab9fb60d2e..3d0be5be33c 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java +++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java @@ -22,8 +22,6 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.inject.Inject; - import org.drools.ruleunits.api.RuleUnit; import org.drools.ruleunits.api.RuleUnitInstance; import org.junit.jupiter.api.Test; @@ -31,6 +29,8 @@ import io.quarkus.test.junit.QuarkusTest; +import jakarta.inject.Inject; + import static org.assertj.core.api.Assertions.assertThat; @QuarkusTest diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java index 7cbcbf9f893..15040a64075 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java +++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java @@ -21,9 +21,6 @@ import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Named; - import org.junit.jupiter.api.Test; import org.kie.kogito.Model; import org.kie.kogito.internal.process.runtime.KogitoProcessInstance; @@ -32,6 +29,9 @@ import io.quarkus.test.junit.QuarkusTest; +import jakarta.inject.Inject; +import jakarta.inject.Named; + import static org.junit.jupiter.api.Assertions.assertEquals; @QuarkusTest diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java index f9949951818..d6eb2524f01 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java +++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java @@ -21,8 +21,6 @@ import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; - import org.assertj.core.data.Offset; import org.junit.jupiter.api.Test; import org.kie.api.pmml.PMML4Result; @@ -31,6 +29,8 @@ import io.quarkus.test.junit.QuarkusTest; +import jakarta.inject.Inject; + import static org.assertj.core.api.Assertions.assertThat; @QuarkusTest diff --git a/quarkus/integration-tests/integration-tests-quarkus-openapi-client/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-openapi-client/pom.xml index 1d24ccfad53..64b91b86bba 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-openapi-client/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-openapi-client/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-quarkus-integration-tests - 2.0.0-SNAPSHOT + 999-SNAPSHOT Kogito :: Integration Tests :: Quarkus :: OpenAPI Client Codegen integration-tests-quarkus-openapi-client diff --git a/quarkus/integration-tests/integration-tests-quarkus-predictions/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-predictions/pom.xml index f1840c9e545..5b51e000514 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-predictions/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-predictions/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-quarkus-integration-tests - 2.0.0-SNAPSHOT + 999-SNAPSHOT integration-tests-quarkus-predictions Kogito :: Integration Tests :: Quarkus :: Predictions diff --git a/quarkus/integration-tests/integration-tests-quarkus-predictions/src/main/java/org/kie/kogito/integrationtests/InjectPredictionModels.java b/quarkus/integration-tests/integration-tests-quarkus-predictions/src/main/java/org/kie/kogito/integrationtests/InjectPredictionModels.java index e39eb0adfaa..2bf2d5333cc 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-predictions/src/main/java/org/kie/kogito/integrationtests/InjectPredictionModels.java +++ b/quarkus/integration-tests/integration-tests-quarkus-predictions/src/main/java/org/kie/kogito/integrationtests/InjectPredictionModels.java @@ -18,7 +18,7 @@ */ package org.kie.kogito.integrationtests; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.kie.kogito.Application; import org.kie.kogito.prediction.PredictionConfig; diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/pom.xml index de6ff3505fe..2e64c8035a2 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/pom.xml @@ -24,7 +24,7 @@ integration-tests-quarkus-processes-persistence org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../pom.xml 4.0.0 @@ -93,7 +93,7 @@ - ${jandex-maven-plugin.group-id} + io.smallrye jandex-maven-plugin diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java index e998425a4c3..c46ca618875 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java @@ -20,11 +20,11 @@ import java.io.IOException; -import javax.enterprise.context.ApplicationScoped; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped public class HelloService { diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java index 641a4f922a2..29a884df6da 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java @@ -18,12 +18,12 @@ */ package org.kie.kogito; -import javax.enterprise.context.ApplicationScoped; - import org.kie.api.event.process.ProcessNodeLeftEvent; import org.kie.kogito.internal.process.event.DefaultKogitoProcessEventListener; import org.kie.kogito.internal.process.runtime.KogitoNodeInstance; +import jakarta.enterprise.context.ApplicationScoped; + import static java.lang.String.format; @ApplicationScoped diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java index abd03d06697..d0162926801 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java @@ -18,10 +18,10 @@ */ package org.kie.kogito.wih; -import javax.enterprise.context.ApplicationScoped; - import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped public class WIHRegister extends DefaultWorkItemHandlerConfig { { diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-filesystem/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-filesystem/pom.xml index 23429ce2d03..3ea5ebc87ad 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-filesystem/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-filesystem/pom.xml @@ -24,7 +24,7 @@ integration-tests-quarkus-processes-persistence org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../pom.xml 4.0.0 diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-infinispan/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-infinispan/pom.xml index 0ec21cf1980..2147efde3aa 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-infinispan/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-infinispan/pom.xml @@ -24,7 +24,7 @@ integration-tests-quarkus-processes-persistence org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../pom.xml 4.0.0 diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-jdbc/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-jdbc/pom.xml index 598ceee142b..d6bbce0b232 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-jdbc/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-jdbc/pom.xml @@ -24,7 +24,7 @@ integration-tests-quarkus-processes-persistence org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../pom.xml 4.0.0 diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-kafka-persistence/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-kafka-persistence/pom.xml index a3c6e2ced0f..efeadd18ca1 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-kafka-persistence/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-kafka-persistence/pom.xml @@ -24,7 +24,7 @@ integration-tests-quarkus-processes-persistence org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../pom.xml 4.0.0 diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-mongodb/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-mongodb/pom.xml index 5ac0dc88f50..e0617e104d1 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-mongodb/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-mongodb/pom.xml @@ -24,7 +24,7 @@ integration-tests-quarkus-processes-persistence org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../pom.xml 4.0.0 diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-postgresql/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-postgresql/pom.xml index f87ec1f6348..e10e202eb5c 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-postgresql/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-postgresql/pom.xml @@ -24,7 +24,7 @@ integration-tests-quarkus-processes-persistence org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../pom.xml 4.0.0 diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/pom.xml index 5081d910d0b..dd01afdc33e 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/pom.xml @@ -22,7 +22,7 @@ org.kie.kogito kogito-quarkus-integration-tests - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 pom diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-reactive/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes-reactive/pom.xml index 9133c6f723b..076675406d7 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes-reactive/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-processes-reactive/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-quarkus-integration-tests - 2.0.0-SNAPSHOT + 999-SNAPSHOT integration-tests-quarkus-processes-reactive Kogito :: Integration Tests :: Quarkus :: Processes :: Reactive diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml index 0c3bbec52d3..29d4ecf0bab 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-quarkus-integration-tests - 2.0.0-SNAPSHOT + 999-SNAPSHOT integration-tests-quarkus-processes Kogito :: Integration Tests :: Quarkus :: Processes diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java index ba823a37886..45332e9c359 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java @@ -18,10 +18,10 @@ */ package org.acme; -import javax.enterprise.context.ApplicationScoped; - import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped public class WIHRegister extends DefaultWorkItemHandlerConfig { { diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java index e3de3ba4b93..e49627146d1 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java @@ -20,18 +20,18 @@ import java.util.Map; -import javax.inject.Inject; -import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import org.kie.kogito.Model; import org.kie.kogito.process.Process; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + @Path("/approvalsdetails") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/EventListenerResource.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/EventListenerResource.java index 9498c0e032f..031fbc0759f 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/EventListenerResource.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/EventListenerResource.java @@ -21,12 +21,12 @@ import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/events") @Produces(MediaType.APPLICATION_JSON) diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java index 7cc318736f6..eca48adac15 100755 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java @@ -20,8 +20,6 @@ import java.io.IOException; -import javax.enterprise.context.ApplicationScoped; - import org.kie.kogito.integrationtests.excetpion.ServiceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,6 +27,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped public class HelloService { @@ -79,4 +79,4 @@ private static void logMethodCall(String method, Object... arguments) { public String echo(String input) { return input; } -} \ No newline at end of file +} diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java index 86dcce9cf3e..ef3d7685398 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java @@ -18,14 +18,14 @@ */ package org.kie.kogito.integrationtests; -import javax.inject.Inject; - import org.kie.kogito.Application; import org.kie.kogito.process.ProcessConfig; import org.kie.kogito.process.Processes; import io.quarkus.runtime.Startup; +import jakarta.inject.Inject; + @Startup public class InjectProcesses { diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java index 171e26f73dd..509ee179601 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java @@ -18,12 +18,12 @@ */ package org.kie.kogito.integrationtests; -import javax.enterprise.context.ApplicationScoped; - import org.kie.api.event.process.ProcessNodeLeftEvent; import org.kie.kogito.internal.process.event.DefaultKogitoProcessEventListener; import org.kie.kogito.internal.process.runtime.KogitoNodeInstance; +import jakarta.enterprise.context.ApplicationScoped; + import static java.lang.String.format; @ApplicationScoped diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java index 1b7f2c85d12..f01b63a22f7 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java @@ -21,13 +21,13 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.context.ApplicationScoped; - import org.kie.kogito.uow.events.UnitOfWorkAbortEvent; import org.kie.kogito.uow.events.UnitOfWorkEndEvent; import org.kie.kogito.uow.events.UnitOfWorkEventListener; import org.kie.kogito.uow.events.UnitOfWorkStartEvent; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped public class UnitOfWorkTestEventListener implements UnitOfWorkEventListener { diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/OASIT.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/OASIT.java index d8ed6f0c95a..50575452aef 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/OASIT.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/OASIT.java @@ -50,14 +50,8 @@ public void testOASisValid() { parseOptions.setResolve(true); SwaggerParseResult result = new OpenAPIV3Parser().readLocation(url, null, parseOptions); - //Will be fixed by https://issues.redhat.com/browse/KOGITO-5734 - assertThat(result.getMessages()).containsExactly( - "attribute components.schemas.MultiinstancetaskprocessModelInput.items is missing", - "attribute components.schemas.MultiinstancetaskprocessModelInput.items is missing", - "attribute components.schemas.MultiinstancetaskprocessModelOutput.items is missing", - "attribute components.schemas.MultiinstancetaskprocessModelOutput.items is missing", - "attribute components.schemas.Multiinstancetaskprocess_2_TaskInput.items is missing", - "attribute components.schemas.Multiinstancetaskprocess_2_TaskInput.items is missing"); + // Should fix https://issues.redhat.com/browse/KOGITO-5734 + assertThat(result.getMessages()).isEmpty(); OpenAPI openAPI = result.getOpenAPI(); PathItem p1 = openAPI.getPaths().get("/approvals"); diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java index 448036c5805..b6e9435da81 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java @@ -26,8 +26,6 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.core.UriBuilder; - import org.acme.travels.Traveller; import org.junit.jupiter.api.Test; import org.kie.kogito.process.workitem.AttachmentInfo; @@ -37,6 +35,8 @@ import io.restassured.RestAssured; import io.restassured.http.ContentType; +import jakarta.ws.rs.core.UriBuilder; + import static io.restassured.RestAssured.given; import static io.restassured.module.jsv.JsonSchemaValidator.matchesJsonSchema; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; diff --git a/quarkus/integration-tests/integration-tests-quarkus-resteasy-classic/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-resteasy-classic/pom.xml index 9fc87432900..8dfe4a8864c 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-resteasy-classic/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-resteasy-classic/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-quarkus-integration-tests - 2.0.0-SNAPSHOT + 999-SNAPSHOT integration-tests-quarkus-resteasy-classic Kogito :: Integration Tests :: Quarkus :: RESTEasy Classic diff --git a/quarkus/integration-tests/integration-tests-quarkus-resteasy-reactive/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-resteasy-reactive/pom.xml index b7b04f54b43..f4adc1cad0f 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-resteasy-reactive/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-resteasy-reactive/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-quarkus-integration-tests - 2.0.0-SNAPSHOT + 999-SNAPSHOT integration-tests-quarkus-resteasy-reactive Kogito :: Integration Tests :: Quarkus :: RESTEasy Reactive diff --git a/quarkus/integration-tests/integration-tests-quarkus-rules/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-rules/pom.xml index 29a7a7dd16f..61b91e6e724 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-rules/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-rules/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-quarkus-integration-tests - 2.0.0-SNAPSHOT + 999-SNAPSHOT integration-tests-quarkus-rules Kogito :: Integration Tests :: Quarkus :: Rules diff --git a/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java b/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java index 13e4d2789ba..7f3b4392ffa 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java +++ b/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java @@ -18,14 +18,14 @@ */ package org.kie.kogito.integrationtests; -import javax.inject.Inject; - import org.kie.kogito.Application; import org.kie.kogito.rules.RuleConfig; import org.kie.kogito.rules.RuleUnits; import io.quarkus.runtime.Startup; +import jakarta.inject.Inject; + @Startup public class InjectRuleUnits { diff --git a/quarkus/integration-tests/integration-tests-quarkus-source-files/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-source-files/pom.xml index d14651a9e9b..6407312c263 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-source-files/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-source-files/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-quarkus-integration-tests - 2.0.0-SNAPSHOT + 999-SNAPSHOT integration-tests-quarkus-source-files Kogito :: Integration Tests :: Quarkus :: Processes :: Source Files diff --git a/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java b/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java index d15814e7457..6424974f441 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java +++ b/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java @@ -20,10 +20,10 @@ import java.util.Random; -import javax.enterprise.context.ApplicationScoped; - import org.kie.kogito.examples.demo.Order; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped public class CalculationService { diff --git a/quarkus/integration-tests/pom.xml b/quarkus/integration-tests/pom.xml index 7c7f5d9b950..6a967e5db0c 100644 --- a/quarkus/integration-tests/pom.xml +++ b/quarkus/integration-tests/pom.xml @@ -24,7 +24,7 @@ org.kie.kogito quarkus - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-quarkus-integration-tests Kogito :: Integration Tests :: Quarkus diff --git a/quarkus/pom.xml b/quarkus/pom.xml index b5a1d59ff5a..9567e2b78fd 100644 --- a/quarkus/pom.xml +++ b/quarkus/pom.xml @@ -27,7 +27,7 @@ org.kie.kogito kogito-build-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../kogito-build/kogito-build-parent/pom.xml diff --git a/quarkus/test/pom.xml b/quarkus/test/pom.xml index 8ecfa16e555..e7282474b5a 100644 --- a/quarkus/test/pom.xml +++ b/quarkus/test/pom.xml @@ -27,7 +27,7 @@ org.kie.kogito quarkus - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-quarkus-test-utils diff --git a/quarkus/test/src/main/java/org/kie/kogito/test/quarkus/QuarkusTestProperty.java b/quarkus/test/src/main/java/org/kie/kogito/test/quarkus/QuarkusTestProperty.java index fa81bad9633..1fce37229bf 100644 --- a/quarkus/test/src/main/java/org/kie/kogito/test/quarkus/QuarkusTestProperty.java +++ b/quarkus/test/src/main/java/org/kie/kogito/test/quarkus/QuarkusTestProperty.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java b/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java index e081fccc335..81ef0db76ee 100644 --- a/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java +++ b/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java @@ -23,8 +23,6 @@ import java.util.Map; import java.util.Optional; -import javax.annotation.Resource; - import org.kie.kogito.test.quarkus.QuarkusTestProperty; import org.testcontainers.containers.Container; @@ -33,6 +31,8 @@ import io.quarkus.test.common.DevServicesContext; import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; +import jakarta.annotation.Resource; + /** * Quarkus resource to be run if and only if it was enabled. */ diff --git a/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java b/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java index 4dc9222f13e..19904330882 100644 --- a/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java +++ b/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java @@ -21,8 +21,6 @@ import java.util.Collections; import java.util.Map; -import javax.annotation.Resource; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -30,6 +28,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import jakarta.annotation.Resource; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.lenient; diff --git a/springboot/addons/events/decisions/pom.xml b/springboot/addons/events/decisions/pom.xml index 9d44e7eddf3..eedcfc3fa5a 100644 --- a/springboot/addons/events/decisions/pom.xml +++ b/springboot/addons/events/decisions/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-springboot-events-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-springboot-events-decisions diff --git a/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java b/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java index 813b8448b55..b48f221fe95 100644 --- a/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java +++ b/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java @@ -18,8 +18,6 @@ */ package org.kie.kogito.eventdriven.decision; -import javax.annotation.PostConstruct; - import org.kie.kogito.config.ConfigBean; import org.kie.kogito.decision.DecisionModels; import org.kie.kogito.event.EventEmitter; @@ -27,6 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import jakarta.annotation.PostConstruct; + @Component public class SpringBootEventDrivenDecisionController extends EventDrivenDecisionController { diff --git a/springboot/addons/events/kafka/pom.xml b/springboot/addons/events/kafka/pom.xml index bb8c3af7d2e..0e70cd93406 100644 --- a/springboot/addons/events/kafka/pom.xml +++ b/springboot/addons/events/kafka/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-springboot-events-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-springboot-events-process-kafka Kogito :: Add-Ons :: Events :: SprintBoot :: Process :: Kafka diff --git a/springboot/addons/events/mongodb/pom.xml b/springboot/addons/events/mongodb/pom.xml index 87101f55d7e..58192709675 100644 --- a/springboot/addons/events/mongodb/pom.xml +++ b/springboot/addons/events/mongodb/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-springboot-events-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java b/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java index 8ab43d6c7e7..5fb16d922f2 100644 --- a/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java +++ b/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java @@ -18,8 +18,6 @@ */ package org.kie.kogito.events.mongodb; -import javax.annotation.PostConstruct; - import org.kie.kogito.mongodb.transaction.AbstractTransactionManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -27,6 +25,8 @@ import com.mongodb.client.MongoClient; +import jakarta.annotation.PostConstruct; + @Component public class SpringbootMongoDBEventPublisher extends MongoDBEventPublisher { diff --git a/springboot/addons/events/pom.xml b/springboot/addons/events/pom.xml index 2debccfa39d..d36b1b36877 100644 --- a/springboot/addons/events/pom.xml +++ b/springboot/addons/events/pom.xml @@ -25,7 +25,7 @@ kogito-addons-springboot-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/springboot/addons/events/predictions/pom.xml b/springboot/addons/events/predictions/pom.xml index c50fa6bd60e..c2c997927f9 100644 --- a/springboot/addons/events/predictions/pom.xml +++ b/springboot/addons/events/predictions/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-springboot-events-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-springboot-events-predictions diff --git a/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java b/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java index ede3ff7785b..c6fc5a3a662 100644 --- a/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java +++ b/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java @@ -18,8 +18,6 @@ */ package org.kie.kogito.eventdriven.predictions; -import javax.annotation.PostConstruct; - import org.kie.kogito.config.ConfigBean; import org.kie.kogito.event.EventEmitter; import org.kie.kogito.event.EventReceiver; @@ -27,6 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import jakarta.annotation.PostConstruct; + @Component public class SpringBootEventDrivenPredictionsController extends EventDrivenPredictionsController { diff --git a/springboot/addons/events/rules/pom.xml b/springboot/addons/events/rules/pom.xml index a512004abd2..e3796d0195d 100644 --- a/springboot/addons/events/rules/pom.xml +++ b/springboot/addons/events/rules/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-addons-springboot-events-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-springboot-events-rules diff --git a/springboot/addons/explainability/pom.xml b/springboot/addons/explainability/pom.xml index 5d7b439e53b..ad5d6aad01d 100644 --- a/springboot/addons/explainability/pom.xml +++ b/springboot/addons/explainability/pom.xml @@ -25,7 +25,7 @@ kogito-addons-springboot-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/springboot/addons/jobs/pom.xml b/springboot/addons/jobs/pom.xml index 8a5537d588b..4a313070835 100644 --- a/springboot/addons/jobs/pom.xml +++ b/springboot/addons/jobs/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-springboot-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-springboot-jobs-management Kogito :: Add-Ons :: Jobs :: Management SprintBoot Addon @@ -53,8 +53,8 @@ kogito-spring-boot-starter - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api org.slf4j diff --git a/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java b/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java index d143618383d..ac20763e55c 100644 --- a/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java +++ b/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java @@ -18,8 +18,6 @@ */ package org.kie.kogito.jobs.management.springboot; -import javax.annotation.PostConstruct; - import org.kie.kogito.jobs.ProcessInstanceJobDescription; import org.kie.kogito.jobs.ProcessJobDescription; import org.kie.kogito.jobs.management.RestJobsService; @@ -30,6 +28,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatusCode; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; @@ -39,6 +38,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.annotation.PostConstruct; + @Component public class SpringRestJobsService extends RestJobsService { @@ -86,7 +87,7 @@ public String scheduleProcessInstanceJob(ProcessInstanceJobDescription descripti ResponseEntity result = restTemplate.postForEntity(getJobsServiceUri(), request, String.class); - if (result.getStatusCode().ordinal() == 200) { + if (result.getStatusCode().isSameCodeAs(HttpStatusCode.valueOf(200))) { LOGGER.debug("Creating of the job {} done with status code {} ", job, result.getStatusCode()); } return job.getId(); @@ -116,4 +117,4 @@ private HttpEntity buildJobRequest(Job job) { headers.setContentType(MediaType.APPLICATION_JSON); return new HttpEntity<>(json, headers); } -} \ No newline at end of file +} diff --git a/springboot/addons/kubernetes/README.md b/springboot/addons/kubernetes/README.md index 007de88b417..3a571a437ae 100644 --- a/springboot/addons/kubernetes/README.md +++ b/springboot/addons/kubernetes/README.md @@ -10,6 +10,15 @@ integrate with the Kubernetes API. It should work fine out of the box without an the [Spring Boot guide](https://docs.spring.io/spring-cloud-kubernetes/docs/current/reference/html/#discoveryclient-for-kubernetes) for more information about any needed customization. +When using this add-on is important to set the following properties in your test environment: + +```properties +spring.main.cloud-platform=KUBERNETES +spring.cloud.bootstrap.enabled=true +``` + +This will guarantee that he right `KubernetesClient` bean is created for you. See more at [Kubernetes Ecosystem Awareness](https://docs.spring.io/spring-cloud-kubernetes/docs/current/reference/html/#kubernetes-ecosystem-awareness). + ## Caching To avoid round trips to the Kubernetes Core API, this implementation uses the [Spring Boot Cache feature](https://docs.spring.io/spring-boot/docs/2.1.6.RELEASE/reference/html/boot-features-caching.html) diff --git a/springboot/addons/kubernetes/pom.xml b/springboot/addons/kubernetes/pom.xml index bd0c0c4f6b6..b6c3bb98e2d 100644 --- a/springboot/addons/kubernetes/pom.xml +++ b/springboot/addons/kubernetes/pom.xml @@ -25,30 +25,13 @@ kogito-addons-springboot-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 kogito-addons-springboot-kubernetes Kogito :: Add-Ons :: Spring Boot :: Kubernetes - - - 5.10.2 - - - - - - io.fabric8 - kubernetes-client-bom - ${version.io.fabric8} - pom - import - - - - org.kie.kogito @@ -66,26 +49,20 @@ com.github.ben-manes.caffeine caffeine + io.fabric8 knative-client - ${version.io.fabric8} io.fabric8 kubernetes-client - ${version.io.fabric8} io.fabric8 kubernetes-server-mock test - - io.fabric8 - knative-mock - test - org.springframework.boot spring-boot-starter-test diff --git a/springboot/addons/kubernetes/src/test/resources/application.properties b/springboot/addons/kubernetes/src/test/resources/application.properties new file mode 100644 index 00000000000..127bc67e5c6 --- /dev/null +++ b/springboot/addons/kubernetes/src/test/resources/application.properties @@ -0,0 +1,2 @@ +spring.main.cloud-platform=KUBERNETES +spring.cloud.bootstrap.enabled=true \ No newline at end of file diff --git a/springboot/addons/mail/pom.xml b/springboot/addons/mail/pom.xml index 9755e27e137..37731070094 100644 --- a/springboot/addons/mail/pom.xml +++ b/springboot/addons/mail/pom.xml @@ -25,7 +25,7 @@ kogito-addons-springboot-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/springboot/addons/messaging/implementation/pom.xml b/springboot/addons/messaging/implementation/pom.xml index 1518e8c432a..0cb416461cb 100644 --- a/springboot/addons/messaging/implementation/pom.xml +++ b/springboot/addons/messaging/implementation/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-springboot-messaging-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-springboot-messaging Kogito :: Add-Ons :: Messaging :: Spring Boot diff --git a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java index cc049ab883c..ddcefb65ea0 100644 --- a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java +++ b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java @@ -18,8 +18,6 @@ */ package org.kie.kogito.addon.cloudevents.spring; -import javax.annotation.PostConstruct; - import org.kie.kogito.event.cloudevents.extension.KogitoExtension; import org.kie.kogito.event.cloudevents.extension.KogitoPredictionsExtension; import org.kie.kogito.event.cloudevents.extension.KogitoProcessExtension; @@ -33,6 +31,8 @@ import io.cloudevents.jackson.JsonFormat; +import jakarta.annotation.PostConstruct; + /** * The goal of this bean is to register the Kogito CloudEvent extension * that allows the system to correctly parse Kogito extension attributes. diff --git a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventEmitter.java b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventEmitter.java index 279b589211b..ad1edac7c69 100644 --- a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventEmitter.java +++ b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventEmitter.java @@ -64,7 +64,6 @@ public CompletionStage emit(DataEvent event) { env.getProperty("kogito.addon.cloudevents.kafka." + KogitoEventStreams.OUTGOING + "." + event.getType(), defaultTopicName), configBean.useCloudEvents() ? ceMarshaller.marshall(event.asCloudEvent(ceMarshaller.cloudEventDataFactory())) : marshaller.marshall(event.getData())) - .completable() .thenApply(r -> null); } catch (IOException e) { throw new UncheckedIOException(e); diff --git a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java index 349d576ea63..a009f26c5a8 100644 --- a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java +++ b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java @@ -26,8 +26,6 @@ import java.util.concurrent.ExecutionException; import java.util.function.Function; -import javax.annotation.PostConstruct; - import org.kie.kogito.config.ConfigBean; import org.kie.kogito.event.CloudEventUnmarshallerFactory; import org.kie.kogito.event.DataEvent; @@ -44,6 +42,8 @@ import org.springframework.messaging.handler.annotation.Payload; import org.springframework.stereotype.Component; +import jakarta.annotation.PostConstruct; + @Component public class SpringKafkaCloudEventReceiver implements EventReceiver { diff --git a/springboot/addons/messaging/integration-tests/pom.xml b/springboot/addons/messaging/integration-tests/pom.xml index de552b2c3fa..f91b3fa6966 100644 --- a/springboot/addons/messaging/integration-tests/pom.xml +++ b/springboot/addons/messaging/integration-tests/pom.xml @@ -28,7 +28,7 @@ org.kie.kogito kogito-addons-springboot-messaging-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-springboot-messaging-it Kogito :: Add-Ons :: Messaging :: Spring Boot (ITs) diff --git a/springboot/addons/messaging/integration-tests/src/it/cloudevents-spring-boot-addon-it-invoked/src/test/java/org/kie/kogito/integrationtests/SpringBootTopicsInformationResourceTest.java b/springboot/addons/messaging/integration-tests/src/it/cloudevents-spring-boot-addon-it-invoked/src/test/java/org/kie/kogito/integrationtests/SpringBootTopicsInformationResourceTest.java index adf98c576b2..c1563ad6b12 100644 --- a/springboot/addons/messaging/integration-tests/src/it/cloudevents-spring-boot-addon-it-invoked/src/test/java/org/kie/kogito/integrationtests/SpringBootTopicsInformationResourceTest.java +++ b/springboot/addons/messaging/integration-tests/src/it/cloudevents-spring-boot-addon-it-invoked/src/test/java/org/kie/kogito/integrationtests/SpringBootTopicsInformationResourceTest.java @@ -25,7 +25,7 @@ import org.kie.kogito.event.ChannelType; import org.kie.kogito.event.Topic; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import io.restassured.RestAssured; diff --git a/springboot/addons/messaging/pom.xml b/springboot/addons/messaging/pom.xml index 8fe188660af..5819c63ff2d 100644 --- a/springboot/addons/messaging/pom.xml +++ b/springboot/addons/messaging/pom.xml @@ -25,7 +25,7 @@ kogito-addons-springboot-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/springboot/addons/monitoring/core/pom.xml b/springboot/addons/monitoring/core/pom.xml index 7cfd88661d9..0f65227cb7d 100644 --- a/springboot/addons/monitoring/core/pom.xml +++ b/springboot/addons/monitoring/core/pom.xml @@ -25,7 +25,7 @@ kogito-addons-springboot-monitoring-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 Kogito :: Add-Ons :: Monitoring Core Springboot diff --git a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java index 8428936c053..0140ff0c485 100644 --- a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java +++ b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java @@ -18,14 +18,14 @@ */ package org.kie.kogito.monitoring.core.springboot; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor; import org.springframework.lang.Nullable; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + public class SpringbootMetricsInterceptor implements HandlerInterceptor { private final MetricsInterceptor metricsInterceptor; diff --git a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java index 2742bfaab23..2a0e69acade 100644 --- a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java +++ b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java @@ -18,8 +18,6 @@ */ package org.kie.kogito.monitoring.core.springboot; -import javax.annotation.PostConstruct; - import org.kie.kogito.KogitoGAV; import org.kie.kogito.config.ConfigBean; import org.kie.kogito.monitoring.core.common.system.metrics.SystemMetricsCollector; @@ -29,6 +27,8 @@ import io.micrometer.core.instrument.Metrics; +import jakarta.annotation.PostConstruct; + @Component public class SpringbootSystemMetricsCollectorProvider implements SystemMetricsCollectorProvider { diff --git a/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java b/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java index 761ce48615d..3ac3909d998 100644 --- a/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java +++ b/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java @@ -20,13 +20,13 @@ import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.junit.jupiter.api.Test; import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor; import org.mockito.ArgumentCaptor; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/springboot/addons/monitoring/elastic/pom.xml b/springboot/addons/monitoring/elastic/pom.xml index 8cd3288800c..2d0f20f2886 100644 --- a/springboot/addons/monitoring/elastic/pom.xml +++ b/springboot/addons/monitoring/elastic/pom.xml @@ -25,7 +25,7 @@ kogito-addons-springboot-monitoring-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java b/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java index 7dff7614e10..dcafe292685 100644 --- a/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java +++ b/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java @@ -18,8 +18,6 @@ */ package org.kie.kogito.monitoring.elastic.springboot; -import javax.annotation.PostConstruct; - import org.kie.kogito.monitoring.elastic.common.ElasticConfigFactory; import org.kie.kogito.monitoring.elastic.common.ElasticRegistry; import org.kie.kogito.monitoring.elastic.common.KogitoElasticConfig; @@ -28,6 +26,8 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; +import jakarta.annotation.PostConstruct; + @Component public class SpringbootElasticRegistryProvider extends ElasticRegistry { @@ -73,4 +73,4 @@ protected void onStart() { elasticConfigFactory.withProperty(KogitoElasticConfig.DOCUMENT_TYPE_KEY, documentType); super.start(elasticConfigFactory.getElasticConfig(), executor); } -} \ No newline at end of file +} diff --git a/springboot/addons/monitoring/pom.xml b/springboot/addons/monitoring/pom.xml index 6f1d43ad115..ae5d7e09998 100644 --- a/springboot/addons/monitoring/pom.xml +++ b/springboot/addons/monitoring/pom.xml @@ -25,7 +25,7 @@ kogito-addons-springboot-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/springboot/addons/monitoring/prometheus/pom.xml b/springboot/addons/monitoring/prometheus/pom.xml index 438abdd6b3b..414cf0ef564 100644 --- a/springboot/addons/monitoring/prometheus/pom.xml +++ b/springboot/addons/monitoring/prometheus/pom.xml @@ -25,7 +25,7 @@ kogito-addons-springboot-monitoring-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 Kogito :: Add-Ons :: Monitoring Prometheus Springboot diff --git a/springboot/addons/persistence/filesystem/pom.xml b/springboot/addons/persistence/filesystem/pom.xml index 4815edaeb9e..25bc4067422 100644 --- a/springboot/addons/persistence/filesystem/pom.xml +++ b/springboot/addons/persistence/filesystem/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-springboot-persistence-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 Kogito :: Add-Ons :: Persistence File System :: Springboot diff --git a/springboot/addons/persistence/infinispan/pom.xml b/springboot/addons/persistence/infinispan/pom.xml index 487a18e2531..244d64fab0d 100644 --- a/springboot/addons/persistence/infinispan/pom.xml +++ b/springboot/addons/persistence/infinispan/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-springboot-persistence-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 Kogito :: Add-Ons :: Persistence Infinispan :: Springboot diff --git a/springboot/addons/persistence/jdbc/pom.xml b/springboot/addons/persistence/jdbc/pom.xml index 377f9b3c8b9..e71ab6440a2 100644 --- a/springboot/addons/persistence/jdbc/pom.xml +++ b/springboot/addons/persistence/jdbc/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-springboot-persistence-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 Kogito :: Add-Ons :: Persistence JDBC :: Springboot diff --git a/springboot/addons/persistence/mongodb/pom.xml b/springboot/addons/persistence/mongodb/pom.xml index 513c5a1fce7..e9ce943d6d5 100644 --- a/springboot/addons/persistence/mongodb/pom.xml +++ b/springboot/addons/persistence/mongodb/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-springboot-persistence-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 Kogito :: Add-Ons :: Persistence MongoDB :: Springboot diff --git a/springboot/addons/persistence/pom.xml b/springboot/addons/persistence/pom.xml index fe2fec472f8..121b6e294e2 100644 --- a/springboot/addons/persistence/pom.xml +++ b/springboot/addons/persistence/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-springboot-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/springboot/addons/persistence/postgresql/pom.xml b/springboot/addons/persistence/postgresql/pom.xml index 66894f5b0c1..0d67785b4e4 100644 --- a/springboot/addons/persistence/postgresql/pom.xml +++ b/springboot/addons/persistence/postgresql/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-springboot-persistence-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 Kogito :: Add-Ons :: Persistence PostgreSQL :: Springboot diff --git a/springboot/addons/pom.xml b/springboot/addons/pom.xml index 447feafdd72..197923d300b 100644 --- a/springboot/addons/pom.xml +++ b/springboot/addons/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito springboot - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/springboot/addons/process-management/pom.xml b/springboot/addons/process-management/pom.xml index 69dc8697080..c3f9ff23c16 100644 --- a/springboot/addons/process-management/pom.xml +++ b/springboot/addons/process-management/pom.xml @@ -25,7 +25,7 @@ kogito-addons-springboot-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/springboot/addons/process-svg/pom.xml b/springboot/addons/process-svg/pom.xml index 4ee9fa31723..c38b0e4d025 100644 --- a/springboot/addons/process-svg/pom.xml +++ b/springboot/addons/process-svg/pom.xml @@ -25,24 +25,12 @@ org.kie.kogito kogito-addons-springboot-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-addons-springboot-process-svg Kogito :: Add-Ons :: Process SVG :: Spring Boot Addon Springboot Addon to interact with Process SVG Service - - - - org.keycloak.bom - keycloak-adapter-bom - ${version.org.keycloak} - pom - import - - - - org.kie.kogito @@ -62,13 +50,13 @@ provided - org.keycloak - keycloak-spring-boot-starter + org.springframework.boot + spring-boot-starter-oauth2-client provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api org.slf4j diff --git a/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/auth/PrincipalAuthTokenReader.java b/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/auth/PrincipalAuthTokenReader.java new file mode 100644 index 00000000000..7a24ec72b9c --- /dev/null +++ b/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/auth/PrincipalAuthTokenReader.java @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.kogito.svg.auth; + +public interface PrincipalAuthTokenReader { + + boolean acceptsPrincipal(Object principal); + + String readToken(T principal); +} diff --git a/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/auth/SpringBootAuthHelper.java b/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/auth/SpringBootAuthHelper.java new file mode 100644 index 00000000000..ef73f791d27 --- /dev/null +++ b/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/auth/SpringBootAuthHelper.java @@ -0,0 +1,56 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.kogito.svg.auth; + +import java.util.List; +import java.util.Optional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.security.core.context.SecurityContext; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Component; + +@Component +@ConditionalOnClass({ SecurityContextHolder.class }) +public class SpringBootAuthHelper { + + private List authTokenReaders; + + public SpringBootAuthHelper(@Autowired List authTokenReaders) { + this.authTokenReaders = authTokenReaders; + } + + public Optional getAuthToken() { + return Optional.ofNullable(getToken()); + } + + private String getToken() { + SecurityContext securityContext = SecurityContextHolder.getContext(); + + if (securityContext == null || securityContext.getAuthentication() == null) { + return null; + } + + Object principal = securityContext.getAuthentication().getPrincipal(); + + return this.authTokenReaders.stream().filter(reader -> reader.acceptsPrincipal(principal)).findFirst() + .map(reader -> "Bearer " + reader.readToken(principal)).orElse(null); + } +} diff --git a/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/auth/impl/JwtPrincipalAuthTokenReader.java b/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/auth/impl/JwtPrincipalAuthTokenReader.java new file mode 100644 index 00000000000..dcb91f44a65 --- /dev/null +++ b/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/auth/impl/JwtPrincipalAuthTokenReader.java @@ -0,0 +1,39 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.kogito.svg.auth.impl; + +import org.kie.kogito.svg.auth.PrincipalAuthTokenReader; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.security.oauth2.jwt.Jwt; +import org.springframework.stereotype.Component; + +@Component +@ConditionalOnClass(Jwt.class) +public class JwtPrincipalAuthTokenReader implements PrincipalAuthTokenReader { + + @Override + public boolean acceptsPrincipal(Object principal) { + return principal instanceof Jwt; + } + + @Override + public String readToken(Jwt principal) { + return principal.getTokenValue(); + } +} diff --git a/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/auth/impl/OIDCPrincipalAuthTokenReader.java b/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/auth/impl/OIDCPrincipalAuthTokenReader.java new file mode 100644 index 00000000000..1187f44c604 --- /dev/null +++ b/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/auth/impl/OIDCPrincipalAuthTokenReader.java @@ -0,0 +1,39 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.kogito.svg.auth.impl; + +import org.kie.kogito.svg.auth.PrincipalAuthTokenReader; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.security.oauth2.core.oidc.user.OidcUser; +import org.springframework.stereotype.Component; + +@Component +@ConditionalOnClass({ OidcUser.class }) +public class OIDCPrincipalAuthTokenReader implements PrincipalAuthTokenReader { + + @Override + public boolean acceptsPrincipal(Object principal) { + return principal instanceof OidcUser; + } + + @Override + public String readToken(OidcUser principal) { + return principal.getIdToken().getTokenValue(); + } +} diff --git a/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java b/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java index ae7baf53b88..8f165cb170f 100644 --- a/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java +++ b/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java @@ -20,11 +20,10 @@ import java.util.ArrayList; import java.util.List; +import java.util.Optional; -import javax.annotation.PostConstruct; - -import org.keycloak.KeycloakPrincipal; import org.kie.kogito.svg.ProcessSVGException; +import org.kie.kogito.svg.auth.SpringBootAuthHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -33,8 +32,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.security.core.context.SecurityContext; -import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; @@ -42,6 +39,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.annotation.PostConstruct; + import static java.util.Collections.emptyList; import static java.util.Collections.singletonMap; @@ -54,16 +53,18 @@ public class SpringBootDataIndexClient implements DataIndexClient { private RestTemplate restTemplate; private ObjectMapper objectMapper; - private boolean isKeycloakAdapterAvailable = false; + private Optional authHelper; @Autowired public SpringBootDataIndexClient( @Value("${kogito.dataindex.http.url:http://localhost:8180}") String dataIndexHttpURL, @Autowired(required = false) RestTemplate restTemplate, - @Autowired ObjectMapper objectMapper) { + @Autowired ObjectMapper objectMapper, + @Autowired Optional authHelper) { this.dataIndexHttpURL = dataIndexHttpURL; this.restTemplate = restTemplate; this.objectMapper = objectMapper; + this.authHelper = authHelper; } @PostConstruct @@ -72,21 +73,6 @@ public void initialize() { restTemplate = new RestTemplate(); LOGGER.debug("No RestTemplate found, creating a default one"); } - try { - Class.forName("org.springframework.security.core.context.SecurityContextHolder"); - Class.forName("org.keycloak.KeycloakPrincipal"); - setKeycloakAdapterAvailable(true); - } catch (ClassNotFoundException exception) { - LOGGER.debug("No Keycloak Adapter available, continue just propagating received authorization header"); - } - } - - public boolean isKeycloakAdapterAvailable() { - return isKeycloakAdapterAvailable; - } - - public void setKeycloakAdapterAvailable(boolean keycloakAdapterAvailable) { - isKeycloakAdapterAvailable = keycloakAdapterAvailable; } @Override @@ -121,13 +107,8 @@ protected List getNodeInstancesFromResponse(JsonNode response) { } protected String getAuthHeader(String authHeader) { - if (isKeycloakAdapterAvailable()) { - SecurityContext securityContext = SecurityContextHolder.getContext(); - if (securityContext != null && - securityContext.getAuthentication() != null && - securityContext.getAuthentication().getPrincipal() instanceof KeycloakPrincipal) { - return "Bearer " + ((KeycloakPrincipal) securityContext.getAuthentication().getPrincipal()).getKeycloakSecurityContext().getTokenString(); - } + if (authHelper.isPresent()) { + return authHelper.get().getAuthToken().orElse(authHeader); } return authHeader; } diff --git a/springboot/addons/process-svg/src/test/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClientTest.java b/springboot/addons/process-svg/src/test/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClientTest.java index 6a613d8ae88..ac50a777701 100644 --- a/springboot/addons/process-svg/src/test/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClientTest.java +++ b/springboot/addons/process-svg/src/test/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClientTest.java @@ -19,13 +19,15 @@ package org.kie.kogito.svg.dataindex; import java.util.List; +import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.keycloak.KeycloakPrincipal; -import org.keycloak.KeycloakSecurityContext; import org.kie.kogito.svg.ProcessSVGException; +import org.kie.kogito.svg.auth.SpringBootAuthHelper; +import org.kie.kogito.svg.auth.impl.JwtPrincipalAuthTokenReader; +import org.kie.kogito.svg.auth.impl.OIDCPrincipalAuthTokenReader; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.http.HttpEntity; @@ -33,6 +35,9 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.oauth2.core.oidc.OidcIdToken; +import org.springframework.security.oauth2.core.oidc.user.OidcUser; +import org.springframework.security.oauth2.jwt.Jwt; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; @@ -80,7 +85,11 @@ public class SpringBootDataIndexClientTest { @BeforeEach void setUp() { - client = new SpringBootDataIndexClient("data-indexURL", restTemplate, objectMapper); + client = buildClient(Optional.empty()); + } + + private SpringBootDataIndexClient buildClient(Optional authHelper) { + return new SpringBootDataIndexClient("data-indexURL", restTemplate, objectMapper, authHelper); } @Test @@ -117,27 +126,43 @@ public void testGetNodeInstancesFromProcessInstance() { } @Test - public void testAuthHeaderWithSecurityContext() { + public void testAuthHeaderWithSecurityContextOidcUserPrincipal() { + String token = "testToken"; + SecurityContext securityContextMock = mock(SecurityContext.class); + Authentication authenticationMock = mock(Authentication.class); + OidcUser principalMock = mock(OidcUser.class); + OidcIdToken tokenMock = mock(OidcIdToken.class); + + when(securityContextMock.getAuthentication()).thenReturn(authenticationMock); + when(authenticationMock.getPrincipal()).thenReturn(principalMock); + when(principalMock.getIdToken()).thenReturn(tokenMock); + when(tokenMock.getTokenValue()).thenReturn(token); + + SecurityContextHolder.setContext(securityContextMock); + client = buildClient(Optional.of(new SpringBootAuthHelper(List.of(new OIDCPrincipalAuthTokenReader(), new JwtPrincipalAuthTokenReader())))); + assertThat(client.getAuthHeader("")).isEqualTo("Bearer " + token); + } + + @Test + public void testAuthHeaderWithSecurityContextJwtPrincipal() { String token = "testToken"; SecurityContext securityContextMock = mock(SecurityContext.class); Authentication authenticationMock = mock(Authentication.class); - KeycloakPrincipal principalMock = mock(KeycloakPrincipal.class); - KeycloakSecurityContext keycloakSecurityContextMock = mock(KeycloakSecurityContext.class); + Jwt principalMock = mock(Jwt.class); when(securityContextMock.getAuthentication()).thenReturn(authenticationMock); when(authenticationMock.getPrincipal()).thenReturn(principalMock); - when(principalMock.getKeycloakSecurityContext()).thenReturn(keycloakSecurityContextMock); - when(keycloakSecurityContextMock.getTokenString()).thenReturn(token); + when(principalMock.getTokenValue()).thenReturn(token); SecurityContextHolder.setContext(securityContextMock); - client.setKeycloakAdapterAvailable(true); + client = buildClient(Optional.of(new SpringBootAuthHelper(List.of(new OIDCPrincipalAuthTokenReader(), new JwtPrincipalAuthTokenReader())))); assertThat(client.getAuthHeader("")).isEqualTo("Bearer " + token); } @Test - public void testAuthHeaderWithoutKeycloakSecurityContext() { + public void testAuthHeaderWithoutSecurityContext() { String authHeader = "Bearer testToken"; - client.setKeycloakAdapterAvailable(false); + client = buildClient(Optional.of(new SpringBootAuthHelper(List.of(new OIDCPrincipalAuthTokenReader(), new JwtPrincipalAuthTokenReader())))); assertThat(client.getAuthHeader(authHeader)).isEqualTo(authHeader); } } diff --git a/springboot/addons/rest-exception-handler/pom.xml b/springboot/addons/rest-exception-handler/pom.xml index 75932681a27..232cca6267f 100644 --- a/springboot/addons/rest-exception-handler/pom.xml +++ b/springboot/addons/rest-exception-handler/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito kogito-addons-springboot-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/springboot/addons/task-management/pom.xml b/springboot/addons/task-management/pom.xml index 6310cf52376..1282b09188f 100644 --- a/springboot/addons/task-management/pom.xml +++ b/springboot/addons/task-management/pom.xml @@ -25,7 +25,7 @@ kogito-addons-springboot-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/springboot/addons/task-notification/pom.xml b/springboot/addons/task-notification/pom.xml index 8a42f459a9a..380d835b687 100644 --- a/springboot/addons/task-notification/pom.xml +++ b/springboot/addons/task-notification/pom.xml @@ -25,7 +25,7 @@ kogito-addons-springboot-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/springboot/addons/tracing-decision/pom.xml b/springboot/addons/tracing-decision/pom.xml index 01db69293a4..e8579af0ac0 100644 --- a/springboot/addons/tracing-decision/pom.xml +++ b/springboot/addons/tracing-decision/pom.xml @@ -25,7 +25,7 @@ kogito-addons-springboot-parent org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -49,8 +49,8 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api diff --git a/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java b/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java index b40973043df..1b1d6b11df5 100644 --- a/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java +++ b/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java @@ -18,14 +18,14 @@ */ package org.kie.kogito.tracing.decision; -import javax.annotation.PostConstruct; - import org.kie.kogito.decision.DecisionModelResourcesProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.kafka.core.KafkaTemplate; import org.springframework.stereotype.Component; +import jakarta.annotation.PostConstruct; + @Component public class SpringBootModelEventEmitter extends BaseModelEventEmitter { diff --git a/springboot/archetype/pom.xml b/springboot/archetype/pom.xml index d34b0f8ca5b..324f26ee661 100644 --- a/springboot/archetype/pom.xml +++ b/springboot/archetype/pom.xml @@ -25,7 +25,7 @@ org.kie.kogito springboot - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-spring-boot-archetype maven-archetype diff --git a/springboot/archetype/src/main/resources/archetype-resources/pom.xml b/springboot/archetype/src/main/resources/archetype-resources/pom.xml index 05fc684d06b..21f342ef793 100644 --- a/springboot/archetype/src/main/resources/archetype-resources/pom.xml +++ b/springboot/archetype/src/main/resources/archetype-resources/pom.xml @@ -60,6 +60,11 @@ spring-boot-starter + + org.springframework.boot + spring-boot-starter-webflux + + org.springframework.boot spring-boot-starter-actuator diff --git a/springboot/archetype/src/main/resources/archetype-resources/src/test/java/GreetingsTest.java b/springboot/archetype/src/main/resources/archetype-resources/src/test/java/GreetingsTest.java index b38b59a135f..ae3a39c9f89 100644 --- a/springboot/archetype/src/main/resources/archetype-resources/src/test/java/GreetingsTest.java +++ b/springboot/archetype/src/main/resources/archetype-resources/src/test/java/GreetingsTest.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.junit4.SpringRunner; diff --git a/springboot/archetype/src/main/resources/archetype-resources/src/test/java/TrafficViolationTest.java b/springboot/archetype/src/main/resources/archetype-resources/src/test/java/TrafficViolationTest.java index 36e2c32e92a..dce38a0f486 100644 --- a/springboot/archetype/src/main/resources/archetype-resources/src/test/java/TrafficViolationTest.java +++ b/springboot/archetype/src/main/resources/archetype-resources/src/test/java/TrafficViolationTest.java @@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.junit4.SpringRunner; diff --git a/springboot/bom/pom.xml b/springboot/bom/pom.xml index 898384e80d4..43fe72cf675 100644 --- a/springboot/bom/pom.xml +++ b/springboot/bom/pom.xml @@ -25,7 +25,7 @@ springboot org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -36,16 +36,16 @@ 2.2.7 - 1.6.14 + 2.1.0 2.4.16 1.3-groovy-2.4 - 2.1.1 - - - 2.0 + + 2022.0.3 + + 6.2.0 @@ -57,9 +57,23 @@ pom import + + io.fabric8 + kubernetes-client-bom + ${version.io.fabric8} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${version.org.springframework.cloud} + pom + import + org.springdoc - springdoc-openapi-ui + springdoc-openapi-starter-webmvc-ui ${version.org.springdoc} @@ -78,18 +92,9 @@ ${version.org.spockframework} test - - org.springframework.cloud - spring-cloud-starter-kubernetes-fabric8 - ${version.org.springframework.cloud.kubernetes.fabric8} - - - org.yaml - snakeyaml - ${snakeyaml.version} - + diff --git a/springboot/integration-tests/pom.xml b/springboot/integration-tests/pom.xml index e8f9f57791e..02451c4e3e5 100644 --- a/springboot/integration-tests/pom.xml +++ b/springboot/integration-tests/pom.xml @@ -24,7 +24,7 @@ org.kie.kogito springboot - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-spring-boot-integration-tests Kogito :: Integration Tests :: Spring Boot diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/pom.xml index 3ef4800305b..602afeca61d 100644 --- a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/pom.xml +++ b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/pom.xml @@ -95,7 +95,7 @@ org.springdoc - springdoc-openapi-ui + springdoc-openapi-starter-webmvc-ui io.swagger.parser.v3 diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java index 14ea9cd74da..5f755f1888d 100644 --- a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java +++ b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java @@ -20,7 +20,7 @@ import io.restassured.RestAssured; import org.junit.jupiter.api.BeforeEach; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; public abstract class BaseRestTest { diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/CommonPMMLTestUtils.java b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/CommonPMMLTestUtils.java index b3a6c7d6be2..9b03bee9f41 100644 --- a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/CommonPMMLTestUtils.java +++ b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/CommonPMMLTestUtils.java @@ -64,7 +64,7 @@ public static void testDescriptive(final String inputData, final String basePath, final String targetField, final Map expectedResultMap) { - String path = basePath + "descriptive"; + String path = basePath + "/descriptive"; final Response response = given() .contentType(ContentType.JSON) .body(inputData) diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/ElementAtIndexTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/ElementAtIndexTest.java index 97d036d980c..2fb7a8b6a3d 100644 --- a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/ElementAtIndexTest.java +++ b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/ElementAtIndexTest.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; 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-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/PMMLRegressionTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/PMMLRegressionTest.java index eda126a5697..a70f8ec22a8 100644 --- a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/PMMLRegressionTest.java +++ b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/PMMLRegressionTest.java @@ -46,7 +46,7 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = KogitoSpringbootApplication.class) class PMMLRegressionTest extends BaseRestTest { - private static final String BASE_PATH = "/PMMLRegression/LinReg/"; + private static final String BASE_PATH = "/PMMLRegression/LinReg"; private static final String TARGET = "fld4"; static { diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/PMMLTreeTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/PMMLTreeTest.java index 96ace7c4a50..ec9e61b8123 100644 --- a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/PMMLTreeTest.java +++ b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/PMMLTreeTest.java @@ -43,7 +43,7 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = KogitoSpringbootApplication.class) class PMMLTreeTest extends BaseRestTest { - private static final String BASE_PATH = "/PMMLTree/SampleMine/"; + private static final String BASE_PATH = "/PMMLTree/SampleMine"; private static final String TARGET = "decision"; static { diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java index 14ea9cd74da..5f755f1888d 100644 --- a/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java +++ b/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java @@ -20,7 +20,7 @@ import io.restassured.RestAssured; import org.junit.jupiter.api.BeforeEach; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; public abstract class BaseRestTest { diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/src/test/java/org/kie/kogito/integrationtests/springboot/PingPongMessageTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/src/test/java/org/kie/kogito/integrationtests/springboot/PingPongMessageTest.java index b4c5998499d..5f0842b5f18 100644 --- a/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/src/test/java/org/kie/kogito/integrationtests/springboot/PingPongMessageTest.java +++ b/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/src/test/java/org/kie/kogito/integrationtests/springboot/PingPongMessageTest.java @@ -84,7 +84,7 @@ private void validateSubProcess(){ .untilAsserted(() -> given() .contentType(ContentType.JSON) .when() - .get("/pong_message/") + .get("/pong_message") .then() .statusCode(200) .body("$.size()", equalTo(1))); @@ -92,7 +92,7 @@ private void validateSubProcess(){ String pId = given() .contentType(ContentType.JSON) .when() - .get("/pong_message/") + .get("/pong_message") .then() .statusCode(200) .body("$.size()", equalTo(1)) diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-norest-it/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-norest-it/pom.xml index b3bca7436f4..802f3f8bf84 100644 --- a/springboot/integration-tests/src/it/integration-tests-springboot-norest-it/pom.xml +++ b/springboot/integration-tests/src/it/integration-tests-springboot-norest-it/pom.xml @@ -81,7 +81,7 @@ org.springdoc - springdoc-openapi-ui + springdoc-openapi-starter-webmvc-ui io.swagger.parser.v3 diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml index 914967ef292..b4c3be2389d 100644 --- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml +++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml @@ -109,13 +109,13 @@ com.github.tomakehurst - wiremock-jre8 + wiremock-jre8-standalone test org.springdoc - springdoc-openapi-ui + springdoc-openapi-starter-webmvc-ui io.swagger.parser.v3 diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java index 14ea9cd74da..5f755f1888d 100644 --- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java +++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java @@ -20,7 +20,7 @@ import io.restassured.RestAssured; import org.junit.jupiter.api.BeforeEach; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; public abstract class BaseRestTest { diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/ProcessTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/ProcessTest.java index f03d48ac500..7fce7feb24e 100644 --- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/ProcessTest.java +++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/ProcessTest.java @@ -30,7 +30,7 @@ import io.restassured.http.ContentType; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; 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-it/src/test/java/org/kie/kogito/integrationtests/springboot/SignalProcessTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/SignalProcessTest.java index 8cdb8bb6cb5..ba7515c73b2 100644 --- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/SignalProcessTest.java +++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/SignalProcessTest.java @@ -48,10 +48,10 @@ void testSignalStartProcess() { given() .contentType(ContentType.JSON) .when() - .get("/signalStart/") + .get("/signalStart") .then() .statusCode(200) - .body("$.size()", is(1)) + .body("size()", is(1)) .body("[0].message", equalTo("hello world")); } @Test diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/TaskTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/TaskTest.java index 174bc82f719..ad02446a923 100644 --- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/TaskTest.java +++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/TaskTest.java @@ -40,7 +40,7 @@ import org.kie.kogito.process.workitem.AttachmentInfo; import org.kie.kogito.task.management.service.TaskInfo; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; 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 49747a2c3fa..0fe330df970 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 @@ -59,11 +59,10 @@ org.infinispan - infinispan-spring-boot-starter-remote + infinispan-spring-boot3-starter-remote - org.kie.kogito - kogito-addons-springboot-process-management + org.kie.kogito kogito-addons-springboot-process-management org.kie.kogito 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 2520f4692a5..38ba84d680a 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 +++ 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 @@ -33,7 +33,7 @@ import org.kie.kogito.AddressType; import org.kie.kogito.Person; import org.kie.kogito.Status; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import io.restassured.RestAssured; import io.restassured.http.ContentType; diff --git a/springboot/pom.xml b/springboot/pom.xml index ec354332298..84d9abd27dc 100644 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito kogito-build-parent - 2.0.0-SNAPSHOT + 999-SNAPSHOT ../kogito-build/kogito-build-parent/pom.xml diff --git a/springboot/starters/kogito-decisions-spring-boot-starter/pom.xml b/springboot/starters/kogito-decisions-spring-boot-starter/pom.xml index 83b410b8ed5..a799824cf99 100644 --- a/springboot/starters/kogito-decisions-spring-boot-starter/pom.xml +++ b/springboot/starters/kogito-decisions-spring-boot-starter/pom.xml @@ -25,7 +25,7 @@ spring-boot-starters org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/springboot/starters/kogito-predictions-spring-boot-starter/pom.xml b/springboot/starters/kogito-predictions-spring-boot-starter/pom.xml index e50b51d7395..c932f69c3c0 100644 --- a/springboot/starters/kogito-predictions-spring-boot-starter/pom.xml +++ b/springboot/starters/kogito-predictions-spring-boot-starter/pom.xml @@ -25,7 +25,7 @@ spring-boot-starters org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/springboot/starters/kogito-processes-spring-boot-starter/pom.xml b/springboot/starters/kogito-processes-spring-boot-starter/pom.xml index 3fdcd7f5312..1ce221586bc 100644 --- a/springboot/starters/kogito-processes-spring-boot-starter/pom.xml +++ b/springboot/starters/kogito-processes-spring-boot-starter/pom.xml @@ -25,7 +25,7 @@ spring-boot-starters org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -42,6 +42,10 @@ org.kie.kogito kogito-rest-workitem + + org.reactivestreams + reactive-streams + org.springframework.security spring-security-core diff --git a/springboot/starters/kogito-rules-spring-boot-starter/pom.xml b/springboot/starters/kogito-rules-spring-boot-starter/pom.xml index 89e2f48c805..e80cc9e6b5b 100644 --- a/springboot/starters/kogito-rules-spring-boot-starter/pom.xml +++ b/springboot/starters/kogito-rules-spring-boot-starter/pom.xml @@ -25,7 +25,7 @@ spring-boot-starters org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/springboot/starters/kogito-spring-boot-starter/pom.xml b/springboot/starters/kogito-spring-boot-starter/pom.xml index abd310cae33..9e9975d584f 100644 --- a/springboot/starters/kogito-spring-boot-starter/pom.xml +++ b/springboot/starters/kogito-spring-boot-starter/pom.xml @@ -25,7 +25,7 @@ spring-boot-starters org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 diff --git a/springboot/starters/pom.xml b/springboot/starters/pom.xml index 6e7adc0e41a..78e4c2118f3 100644 --- a/springboot/starters/pom.xml +++ b/springboot/starters/pom.xml @@ -25,7 +25,7 @@ springboot org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT 4.0.0 @@ -64,12 +64,12 @@ kogito-api - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api - com.sun.activation - javax.activation + org.eclipse.angus + angus-activation io.swagger.core.v3 @@ -77,7 +77,7 @@ org.springdoc - springdoc-openapi-ui + springdoc-openapi-starter-webmvc-ui \ No newline at end of file diff --git a/springboot/test/pom.xml b/springboot/test/pom.xml index 979e7a09987..1cee214732e 100644 --- a/springboot/test/pom.xml +++ b/springboot/test/pom.xml @@ -27,7 +27,7 @@ springboot org.kie.kogito - 2.0.0-SNAPSHOT + 999-SNAPSHOT kogito-spring-boot-test-utils diff --git a/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java b/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java index 532c5c34be5..cac8d290cf3 100644 --- a/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java +++ b/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java @@ -29,8 +29,6 @@ import java.util.concurrent.TimeoutException; import java.util.function.Consumer; -import javax.annotation.PreDestroy; - import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.clients.producer.KafkaProducer; @@ -44,6 +42,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; +import jakarta.annotation.PreDestroy; + import static java.lang.String.format; import static java.util.Collections.singleton; diff --git a/springboot/test/src/main/java/org/kie/kogito/testcontainers/springboot/KeycloakSpringBootTestResource.java b/springboot/test/src/main/java/org/kie/kogito/testcontainers/springboot/KeycloakSpringBootTestResource.java index 6379c92f261..4f593f5b874 100644 --- a/springboot/test/src/main/java/org/kie/kogito/testcontainers/springboot/KeycloakSpringBootTestResource.java +++ b/springboot/test/src/main/java/org/kie/kogito/testcontainers/springboot/KeycloakSpringBootTestResource.java @@ -18,13 +18,12 @@ */ package org.kie.kogito.testcontainers.springboot; +import java.util.HashMap; import java.util.Map; import org.kie.kogito.test.resources.ConditionalSpringBootTestResource; import org.kie.kogito.testcontainers.KogitoKeycloakContainer; -import static java.util.Collections.singletonMap; - /** * Keycloak spring boot resource that works within the test lifecycle. * @@ -32,6 +31,7 @@ public class KeycloakSpringBootTestResource extends ConditionalSpringBootTestResource { public static final String KOGITO_KEYCLOAK_PROPERTY = "keycloak.auth-server-url"; + public static final String OAUTH2_JWT_ISSUER = "spring.security.oauth2.resourceserver.jwt.issuer-uri"; public KeycloakSpringBootTestResource() { super(new KogitoKeycloakContainer()); @@ -39,7 +39,10 @@ public KeycloakSpringBootTestResource() { @Override protected Map getProperties() { - return singletonMap(KOGITO_KEYCLOAK_PROPERTY, String.format("http://localhost:%s", getTestResource().getMappedPort())); + Map properties = new HashMap<>(); + properties.put(KOGITO_KEYCLOAK_PROPERTY, String.format("http://localhost:%s", getTestResource().getMappedPort())); + properties.put(OAUTH2_JWT_ISSUER, String.format("http://localhost:%s/realms/%s", getTestResource().getMappedPort(), KogitoKeycloakContainer.REALM)); + return properties; } public static class Conditional extends KeycloakSpringBootTestResource {