This is an automated email from the ASF dual-hosted git repository. mariofusco pushed a commit to branch q3lts in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-runtimes.git
commit a55c8ae75adf0e4896c28f4d2d07d556c6de1316 Author: Toshiya Kobayashi <[email protected]> AuthorDate: Wed Nov 22 17:46:23 2023 +0900 fixed quarkus3 patches --- .../patches/0002_javax.ws_to_jakarta.ws.patch | 50 ++----------------- .../0003_javax.inject_to_jakarta.inject.patch | 57 ---------------------- ...04_javax.enterprise_to_jakarta.enterprise.patch | 51 +------------------ ...05_javax.annotation_to_jakarta.annotation.patch | 13 ----- ...5_javax.inject_to_jakarta.inject-api.deps.patch | 6 +-- .../patches/0016_update_dependencies_version.patch | 20 ++++---- 6 files changed, 18 insertions(+), 179 deletions(-) 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 e8b8af0475..52aba1d51a 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 810fc5b089..7606b2be78 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 extends NodeWithAnnotations<?>> 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 extends NodeWithAnnotations<?>> 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 extends NodeWithAnnotations<?>> 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 6a10e67976..0cd980d35b 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 extends NodeWithAnnotations<?>> 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 extends NodeWithAnnotations<?>> 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 extends NodeWithAnnotations<?>> 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 330d262015..ecf893d034 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 555fb03148..ea7f72dee4 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 @@ - <version.com.sun.activation>2.0.0</version.com.sun.activation> +@@ -48,7 +48,7 @@ + <version.com.sun.activation>2.0.1</version.com.sun.activation> <version.javax.annotation>1.3.2</version.javax.annotation> <version.javax.annotation-api>1.3.2</version.javax.annotation-api> - <version.javax.inject>1</version.javax.inject> + <version.javax.inject>2.0.1</version.javax.inject> <version.javax.validation>2.0.1.Final</version.javax.validation> <version.javax.xml.bind>2.3.1</version.javax.xml.bind> - <version.org.eclipse.microprofile.openapi>3.1</version.org.eclipse.microprofile.openapi> + <version.org.eclipse.microprofile.openapi>3.1.1</version.org.eclipse.microprofile.openapi> @@ -545,8 +545,8 @@ <version>3.0.2</version> </dependency> 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 58588eaece..24d68aa01f 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 + <version.com.oracle.database.jdbc>21.5.0.0</version.com.oracle.database.jdbc> <version.com.sun.xml.bind.core>2.3.0.1</version.com.sun.xml.bind.core> <version.com.sun.xml.bind.impl>2.3.5</version.com.sun.xml.bind.impl> - <version.com.sun.activation>2.0.0</version.com.sun.activation> + <version.com.sun.activation>2.0.1</version.com.sun.activation> @@ -57,8 +57,8 @@ <version.io.cloudevents>2.3.0</version.io.cloudevents> - <version.io.fabric8.kubernetes-client>6.5.1</version.io.fabric8.kubernetes-client> - <version.io.micrometer>1.10.5</version.io.micrometer> + <version.io.fabric8.kubernetes-client>6.7.2</version.io.fabric8.kubernetes-client> + <version.io.micrometer>1.11.1</version.io.micrometer> - <version.org.flywaydb>9.8.3</version.org.flywaydb> - <version.org.postgresql>42.5.1</version.org.postgresql> + <version.org.flywaydb>9.16.3</version.org.flywaydb> + <version.org.postgresql>42.6.0</version.org.postgresql> - <version.io.serverlessworkflow>4.0.4.Final</version.io.serverlessworkflow> + <version.io.serverlessworkflow>4.0.5.Final</version.io.serverlessworkflow> <!-- Aligned with Quarkus 2.7 (LTS) - see https://issues.redhat.com/browse/KOGITO-7971 --> - <version.io.smallrye-open-api>3.3.2</version.io.smallrye-open-api> + <version.io.smallrye-open-api>3.4.0</version.io.smallrye-open-api> @@ -87,7 +87,7 @@ <version.org.keycloak>21.0.1</version.org.keycloak> <!-- It seems that the confluent kafka cannot replace wurstmeister/kafka so easily. See FAI-729 --> @@ -31,23 +31,23 @@ index 37608a0de9..b7087b7e44 100644 <version.org.mongo-image>4.4.14</version.org.mongo-image> <version.org.mozilla.rhino>1.7.13</version.org.mozilla.rhino> <version.org.redis>2.0.4</version.org.redis> -@@ -96,7 +96,7 @@ +@@ -97,7 +97,7 @@ <version.org.assertj>3.22.0</version.org.assertj> <version.org.json-unit-assertj>2.9.0</version.org.json-unit-assertj> <version.org.hamcrest>1.3</version.org.hamcrest> <!-- else old version coming from Mockito wins and breaks tests --> - <version.org.junit.minor>8.2</version.org.junit.minor> <!-- so that org.junit.platform and org.junit can share the same minor version --> + <version.org.junit.minor>9.2</version.org.junit.minor> <!-- so that org.junit.platform and org.junit can share the same minor version --> <version.org.junit>5.${version.org.junit.minor}</version.org.junit> - <version.org.junit.jupiter>5.9.2</version.org.junit.jupiter> - <version.org.junit.vintage>5.9.2</version.org.junit.vintage> -@@ -112,13 +112,13 @@ + <version.org.junit.jupiter>5.9.3</version.org.junit.jupiter> + <version.org.junit.vintage>5.9.3</version.org.junit.vintage> +@@ -113,13 +113,13 @@ <version.org.mvel>2.5.0.Final</version.org.mvel> <version.org.reactivestreams>1.0.4</version.org.reactivestreams> <version.org.reflections>0.10.2</version.org.reflections> - <version.org.slf4j>1.7.36</version.org.slf4j> + <version.org.slf4j>2.0.6</version.org.slf4j> - <version.maven>3.9.1</version.maven> + <version.maven>3.9.3</version.maven> <version.maven.plugin>3.7.1</version.maven.plugin> <version.maven.invoker>3.2.0</version.maven.invoker> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
