From d2dd0faa112730c20c8dea4dae60c698296df389 Mon Sep 17 00:00:00 2001 From: Rishiraj Anand Date: Tue, 22 Oct 2024 12:07:57 +0530 Subject: [PATCH 1/4] Upgrade quarkus to 3.15 --- addons/common/persistence/infinispan/pom.xml | 2 +- ...rotostreamProtobufAdapterTypeProvider.java | 2 +- kogito-build/kogito-dependencies-bom/pom.xml | 34 +++++++++------ .../kogito-codegen-processes/pom.xml | 4 ++ .../AbstractMarshallerGenerator.java | 43 +++++-------------- .../AbstractMarshallerGeneratorTest.java | 1 - quarkus/addons/camel/deployment/pom.xml | 3 ++ quarkus/addons/camel/runtime/pom.xml | 3 ++ quarkus/addons/dynamic/deployment/pom.xml | 3 ++ .../addons/dynamic/integration-tests/pom.xml | 4 ++ quarkus/addons/dynamic/runtime/pom.xml | 3 ++ .../events/decisions/deployment/pom.xml | 3 ++ .../addons/events/mongodb/deployment/pom.xml | 3 ++ .../events/predictions/deployment/pom.xml | 3 ++ quarkus/addons/events/process/runtime/pom.xml | 3 ++ quarkus/addons/explainability/runtime/pom.xml | 3 ++ .../deployment/pom.xml | 3 ++ .../runtime/pom.xml | 3 ++ quarkus/addons/flyway/deployment/pom.xml | 3 ++ quarkus/addons/flyway/runtime/pom.xml | 3 ++ ...AddOnJobsKnativeEventingProcessorTest.java | 2 +- .../addons/jobs/messaging/deployment/pom.xml | 3 ++ .../knative/eventing/deployment/pom.xml | 3 ++ ...gitoAddOnKnativeEventingProcessorTest.java | 2 +- .../eventing/integration-tests/pom.xml | 4 ++ .../addons/knative/eventing/runtime/pom.xml | 3 ++ .../addons/knative/serving/deployment/pom.xml | 3 ++ .../addons/knative/serving/runtime/pom.xml | 3 ++ .../persistence/infinispan/runtime/pom.xml | 3 ++ .../persistence/postgresql/runtime/pom.xml | 3 ++ .../persistence/rocksdb/runtime/pom.xml | 3 ++ .../integration-tests/pom.xml | 4 ++ .../addons/process-management/runtime/pom.xml | 3 ++ .../addons/python/integration-tests/pom.xml | 4 ++ .../kogito-quarkus-common-deployment/pom.xml | 2 +- .../kogito-quarkus-common/pom.xml | 3 ++ .../kogito-quarkus-rules-deployment/pom.xml | 3 ++ .../kogito-quarkus-rules/pom.xml | 3 ++ .../pom.xml | 15 ++++++- .../pom.xml | 9 ++-- .../pom.xml | 3 ++ 41 files changed, 153 insertions(+), 57 deletions(-) diff --git a/addons/common/persistence/infinispan/pom.xml b/addons/common/persistence/infinispan/pom.xml index 436eb882c18..609f06d9732 100644 --- a/addons/common/persistence/infinispan/pom.xml +++ b/addons/common/persistence/infinispan/pom.xml @@ -50,7 +50,7 @@ org.infinispan - infinispan-client-hotrod-jakarta + infinispan-client-hotrod org.kie.kogito diff --git a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/protobuf/ProtostreamProtobufAdapterTypeProvider.java b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/protobuf/ProtostreamProtobufAdapterTypeProvider.java index 32a670c929c..348acac59b7 100644 --- a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/protobuf/ProtostreamProtobufAdapterTypeProvider.java +++ b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/protobuf/ProtostreamProtobufAdapterTypeProvider.java @@ -183,7 +183,7 @@ private FieldDescriptorProto buildFieldDescriptor(FieldDescriptor descriptor) { } } fieldBuilder.setLabel(descriptor.getLabel() == Label.ONE_OF ? FieldDescriptorProto.Label.LABEL_OPTIONAL : FieldDescriptorProto.Label.valueOf("LABEL_" + descriptor.getLabel().name())); - fieldBuilder.setProto3Optional(!descriptor.isRequired()); + fieldBuilder.setProto3Optional(descriptor.getLabel() != Label.REQUIRED); return fieldBuilder.build(); } diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-dependencies-bom/pom.xml index 9d4c812444c..bd8964bb678 100644 --- a/kogito-build/kogito-dependencies-bom/pom.xml +++ b/kogito-build/kogito-dependencies-bom/pom.xml @@ -35,7 +35,7 @@ - 3.8.6 + 3.15.1 ${version.io.quarkus} 3.2.6 3.7.0 @@ -50,7 +50,7 @@ 2.4.10 1.0.0-preview.20240207 2.0.2 - 2.4.1 + 2.5.0 0.3.0 2.4.1 0.2.3 @@ -80,8 +80,8 @@ --> 6.10.0 1.12.2 - 9.22.3 - 42.7.2 + 10.17.3 + 42.7.4 2.2.220 4.0.5.Final @@ -102,8 +102,8 @@ 23.1.2 - 14.0.27.Final - 4.6.5.Final + 15.0.8.Final + 5.0.8.Final 7.10.2 @@ -114,7 +114,7 @@ 24.0.4 2.12-2.2.1 - 4.11.1 + 5.1.4 4.4.14 1.7.13 2.0.4 @@ -130,11 +130,11 @@ 5.10.2 1.10.2 5.8.0 - 1.19.6 + 1.20.1 2.10.0 - 5.4.0 + 5.5.0 - 1.14.11 + 1.14.18 2.5.0.Final 1.0.4 @@ -731,7 +731,11 @@ flyway-core ${version.org.flywaydb} - + + org.flywaydb + flyway-database-postgresql + ${version.org.flywaydb} + org.infinispan @@ -740,7 +744,7 @@ org.infinispan - infinispan-client-hotrod-jakarta + infinispan-client-hotrod ${version.org.infinispan} @@ -758,7 +762,11 @@ protostream ${version.org.infinispan.protostream} - + + org.infinispan.protostream + protostream-processor + ${version.org.infinispan.protostream} + org.rocksdb diff --git a/kogito-codegen-modules/kogito-codegen-processes/pom.xml b/kogito-codegen-modules/kogito-codegen-processes/pom.xml index f3f05a38a1a..ecf6c51ee31 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/pom.xml +++ b/kogito-codegen-modules/kogito-codegen-processes/pom.xml @@ -71,6 +71,10 @@ org.infinispan.protostream protostream + + org.infinispan.protostream + protostream-processor + com.github.javaparser javaparser-symbol-solver-core diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGenerator.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGenerator.java index ac695481d2c..cb4649373af 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGenerator.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGenerator.java @@ -20,14 +20,8 @@ import java.io.IOException; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; -import java.util.NoSuchElementException; -import java.util.UUID; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -36,11 +30,7 @@ import org.infinispan.protostream.FileDescriptorSource; import org.infinispan.protostream.SerializationContext; import org.infinispan.protostream.config.Configuration; -import org.infinispan.protostream.descriptors.Descriptor; -import org.infinispan.protostream.descriptors.EnumDescriptor; -import org.infinispan.protostream.descriptors.FieldDescriptor; -import org.infinispan.protostream.descriptors.FileDescriptor; -import org.infinispan.protostream.descriptors.Option; +import org.infinispan.protostream.descriptors.*; import org.infinispan.protostream.impl.SerializationContextImpl; import org.kie.kogito.codegen.api.context.KogitoBuildContext; import org.kie.kogito.codegen.api.context.impl.JavaKogitoBuildContext; @@ -54,25 +44,8 @@ import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import com.github.javaparser.ast.body.MethodDeclaration; import com.github.javaparser.ast.body.VariableDeclarator; -import com.github.javaparser.ast.expr.BinaryExpr; -import com.github.javaparser.ast.expr.CastExpr; -import com.github.javaparser.ast.expr.ClassExpr; -import com.github.javaparser.ast.expr.EnclosedExpr; -import com.github.javaparser.ast.expr.Expression; -import com.github.javaparser.ast.expr.IntegerLiteralExpr; -import com.github.javaparser.ast.expr.MethodCallExpr; -import com.github.javaparser.ast.expr.NameExpr; -import com.github.javaparser.ast.expr.NullLiteralExpr; -import com.github.javaparser.ast.expr.ObjectCreationExpr; -import com.github.javaparser.ast.expr.SimpleName; -import com.github.javaparser.ast.expr.StringLiteralExpr; -import com.github.javaparser.ast.expr.VariableDeclarationExpr; -import com.github.javaparser.ast.stmt.BlockStmt; -import com.github.javaparser.ast.stmt.IfStmt; -import com.github.javaparser.ast.stmt.ReturnStmt; -import com.github.javaparser.ast.stmt.SwitchEntry; -import com.github.javaparser.ast.stmt.SwitchStmt; -import com.github.javaparser.ast.stmt.ThrowStmt; +import com.github.javaparser.ast.expr.*; +import com.github.javaparser.ast.stmt.*; import com.github.javaparser.ast.type.ClassOrInterfaceType; import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; @@ -228,7 +201,7 @@ public List generate(FileDescriptorSource proto) throws IOExcep } if (customTypeName.equals(Serializable.class.getName())) { - String fieldClazz = (String) field.getOptionByName(KOGITO_JAVA_CLASS_OPTION); + String fieldClazz = field.getOptionByName(KOGITO_JAVA_CLASS_OPTION).getName(); if (fieldClazz == null) { throw new IllegalArgumentException(format("Serializable proto field '%s' is missing value for option %s", field.getName(), KOGITO_JAVA_CLASS_OPTION)); } else { @@ -317,7 +290,11 @@ public List generate(FileDescriptorSource proto) throws IOExcep } protected String packageFromOption(FileDescriptor d, Descriptor msg) { - return packageFromOption(d, msg.getOption(JAVA_PACKAGE_OPTION)); + Option option = msg.getOptions().stream() + .filter(o -> JAVA_PACKAGE_OPTION.equals(o.getName())) + .findAny() + .orElse(null); + return packageFromOption(d, option); } protected String packageFromOption(FileDescriptor d, EnumDescriptor msg) { diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGeneratorTest.java b/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGeneratorTest.java index 3004477bdf7..ac8430f2f73 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGeneratorTest.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGeneratorTest.java @@ -81,7 +81,6 @@ void testPersonMarshallers() throws Exception { assertThat(proto.getMessages()).hasSize(1); MarshallerGenerator marshallerGenerator = withGenerator(Person.class); - List classes = marshallerGenerator.generate(proto.serialize()); assertThat(classes).isNotNull().hasSize(1); diff --git a/quarkus/addons/camel/deployment/pom.xml b/quarkus/addons/camel/deployment/pom.xml index a613ae06df0..22ffe09b80e 100644 --- a/quarkus/addons/camel/deployment/pom.xml +++ b/quarkus/addons/camel/deployment/pom.xml @@ -82,6 +82,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/camel/runtime/pom.xml b/quarkus/addons/camel/runtime/pom.xml index a68826951ba..53848a05617 100644 --- a/quarkus/addons/camel/runtime/pom.xml +++ b/quarkus/addons/camel/runtime/pom.xml @@ -90,6 +90,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/dynamic/deployment/pom.xml b/quarkus/addons/dynamic/deployment/pom.xml index 7c4332e4de3..aebebbe291e 100644 --- a/quarkus/addons/dynamic/deployment/pom.xml +++ b/quarkus/addons/dynamic/deployment/pom.xml @@ -70,6 +70,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/dynamic/integration-tests/pom.xml b/quarkus/addons/dynamic/integration-tests/pom.xml index 7109502889e..fc2b6b13058 100644 --- a/quarkus/addons/dynamic/integration-tests/pom.xml +++ b/quarkus/addons/dynamic/integration-tests/pom.xml @@ -23,6 +23,10 @@ org.kie kie-addons-quarkus-process-dynamic + + io.quarkus + quarkus-oidc-client-filter + io.quarkus quarkus-resteasy diff --git a/quarkus/addons/dynamic/runtime/pom.xml b/quarkus/addons/dynamic/runtime/pom.xml index 98c099d0d60..560872c413c 100644 --- a/quarkus/addons/dynamic/runtime/pom.xml +++ b/quarkus/addons/dynamic/runtime/pom.xml @@ -84,6 +84,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/events/decisions/deployment/pom.xml b/quarkus/addons/events/decisions/deployment/pom.xml index 7a12f4a95e7..b6e9f2b346b 100644 --- a/quarkus/addons/events/decisions/deployment/pom.xml +++ b/quarkus/addons/events/decisions/deployment/pom.xml @@ -64,6 +64,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/events/mongodb/deployment/pom.xml b/quarkus/addons/events/mongodb/deployment/pom.xml index 36fe75a2786..6d19e6ecb37 100644 --- a/quarkus/addons/events/mongodb/deployment/pom.xml +++ b/quarkus/addons/events/mongodb/deployment/pom.xml @@ -64,6 +64,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/events/predictions/deployment/pom.xml b/quarkus/addons/events/predictions/deployment/pom.xml index 403b958d167..d485b12fa61 100644 --- a/quarkus/addons/events/predictions/deployment/pom.xml +++ b/quarkus/addons/events/predictions/deployment/pom.xml @@ -64,6 +64,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/events/process/runtime/pom.xml b/quarkus/addons/events/process/runtime/pom.xml index 50ef92684c1..b852f1149fa 100644 --- a/quarkus/addons/events/process/runtime/pom.xml +++ b/quarkus/addons/events/process/runtime/pom.xml @@ -134,6 +134,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/explainability/runtime/pom.xml b/quarkus/addons/explainability/runtime/pom.xml index 5a36104b6b2..f4d2cc1b614 100644 --- a/quarkus/addons/explainability/runtime/pom.xml +++ b/quarkus/addons/explainability/runtime/pom.xml @@ -116,6 +116,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/deployment/pom.xml b/quarkus/addons/fabric8-kubernetes-service-catalog/deployment/pom.xml index 4535fa8c29b..7f847f9cde6 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/deployment/pom.xml +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/deployment/pom.xml @@ -63,6 +63,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml index 0f8b22f9f69..e37281d150c 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml @@ -129,6 +129,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/flyway/deployment/pom.xml b/quarkus/addons/flyway/deployment/pom.xml index de160bad027..bce440473e8 100644 --- a/quarkus/addons/flyway/deployment/pom.xml +++ b/quarkus/addons/flyway/deployment/pom.xml @@ -75,6 +75,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/flyway/runtime/pom.xml b/quarkus/addons/flyway/runtime/pom.xml index 3190d2cbf8b..0d56fede89e 100644 --- a/quarkus/addons/flyway/runtime/pom.xml +++ b/quarkus/addons/flyway/runtime/pom.xml @@ -86,6 +86,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/jobs/knative-eventing/deployment/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/deployment/KogitoAddOnJobsKnativeEventingProcessorTest.java b/quarkus/addons/jobs/knative-eventing/deployment/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/deployment/KogitoAddOnJobsKnativeEventingProcessorTest.java index 7aaa4c8e4a5..92d5ef31d63 100644 --- a/quarkus/addons/jobs/knative-eventing/deployment/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/deployment/KogitoAddOnJobsKnativeEventingProcessorTest.java +++ b/quarkus/addons/jobs/knative-eventing/deployment/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/deployment/KogitoAddOnJobsKnativeEventingProcessorTest.java @@ -161,7 +161,7 @@ void buildCloudEventsMetadataWithoutEvents() { KogitoAddOnJobsKnativeEventingProcessor processor = new KogitoAddOnJobsKnativeEventingProcessor(); processor.buildCloudEventsMetadata(singletonList(kogitoProcessContainerGeneratorBuildItem), buildItemProducer); - verify(buildItemProducer, never()).produce(any()); + verify(buildItemProducer, never()).produce(any(KogitoCloudEventsBuildItem.class)); } @Test diff --git a/quarkus/addons/jobs/messaging/deployment/pom.xml b/quarkus/addons/jobs/messaging/deployment/pom.xml index 85f34759918..f648834dd98 100644 --- a/quarkus/addons/jobs/messaging/deployment/pom.xml +++ b/quarkus/addons/jobs/messaging/deployment/pom.xml @@ -83,6 +83,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/knative/eventing/deployment/pom.xml b/quarkus/addons/knative/eventing/deployment/pom.xml index c21404d0034..8ae90866aab 100644 --- a/quarkus/addons/knative/eventing/deployment/pom.xml +++ b/quarkus/addons/knative/eventing/deployment/pom.xml @@ -111,6 +111,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoAddOnKnativeEventingProcessorTest.java b/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoAddOnKnativeEventingProcessorTest.java index 9d9a8a2267c..b194995fd59 100644 --- a/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoAddOnKnativeEventingProcessorTest.java +++ b/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoAddOnKnativeEventingProcessorTest.java @@ -179,7 +179,7 @@ void checkProcessEventsWithoutEventPublisher() { KogitoAddOnKnativeEventingProcessor eventingProcessor = new KogitoAddOnKnativeEventingProcessor(); eventingProcessor.checkProcessEvents(buildProducer, combinedIndex); - verify(buildProducer, never()).produce(any()); + verify(buildProducer, never()).produce(any(SystemPropertyBuildItem.class)); } @Test diff --git a/quarkus/addons/knative/eventing/integration-tests/pom.xml b/quarkus/addons/knative/eventing/integration-tests/pom.xml index 6852603d081..332d144d109 100644 --- a/quarkus/addons/knative/eventing/integration-tests/pom.xml +++ b/quarkus/addons/knative/eventing/integration-tests/pom.xml @@ -57,6 +57,10 @@ org.kie kie-addons-quarkus-knative-eventing + + io.quarkus + quarkus-resteasy-client-oidc-filter + io.quarkus quarkus-resteasy diff --git a/quarkus/addons/knative/eventing/runtime/pom.xml b/quarkus/addons/knative/eventing/runtime/pom.xml index 92bc7ce7187..1e8233ccd69 100644 --- a/quarkus/addons/knative/eventing/runtime/pom.xml +++ b/quarkus/addons/knative/eventing/runtime/pom.xml @@ -110,6 +110,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/knative/serving/deployment/pom.xml b/quarkus/addons/knative/serving/deployment/pom.xml index 70b4e7f8c03..206dd0bf6cd 100644 --- a/quarkus/addons/knative/serving/deployment/pom.xml +++ b/quarkus/addons/knative/serving/deployment/pom.xml @@ -88,6 +88,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/knative/serving/runtime/pom.xml b/quarkus/addons/knative/serving/runtime/pom.xml index 86e00cd1a2b..fc784c365a1 100644 --- a/quarkus/addons/knative/serving/runtime/pom.xml +++ b/quarkus/addons/knative/serving/runtime/pom.xml @@ -147,6 +147,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/persistence/infinispan/runtime/pom.xml b/quarkus/addons/persistence/infinispan/runtime/pom.xml index 4fc149b6251..b91aa456775 100644 --- a/quarkus/addons/persistence/infinispan/runtime/pom.xml +++ b/quarkus/addons/persistence/infinispan/runtime/pom.xml @@ -93,6 +93,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/persistence/postgresql/runtime/pom.xml b/quarkus/addons/persistence/postgresql/runtime/pom.xml index a2f11150fb3..2e89894d97d 100644 --- a/quarkus/addons/persistence/postgresql/runtime/pom.xml +++ b/quarkus/addons/persistence/postgresql/runtime/pom.xml @@ -107,6 +107,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/persistence/rocksdb/runtime/pom.xml b/quarkus/addons/persistence/rocksdb/runtime/pom.xml index 1056cf7965d..4c15802769a 100644 --- a/quarkus/addons/persistence/rocksdb/runtime/pom.xml +++ b/quarkus/addons/persistence/rocksdb/runtime/pom.xml @@ -92,6 +92,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/process-management/integration-tests/pom.xml b/quarkus/addons/process-management/integration-tests/pom.xml index 6bbfa96c5fa..43a2493f594 100644 --- a/quarkus/addons/process-management/integration-tests/pom.xml +++ b/quarkus/addons/process-management/integration-tests/pom.xml @@ -58,6 +58,10 @@ org.kie kie-addons-quarkus-process-management + + io.quarkus + quarkus-oidc-client-filter + io.quarkus quarkus-resteasy diff --git a/quarkus/addons/process-management/runtime/pom.xml b/quarkus/addons/process-management/runtime/pom.xml index 48161a444b1..dea3c6b06c7 100644 --- a/quarkus/addons/process-management/runtime/pom.xml +++ b/quarkus/addons/process-management/runtime/pom.xml @@ -123,6 +123,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/python/integration-tests/pom.xml b/quarkus/addons/python/integration-tests/pom.xml index 1655db8a07f..06a384f46c3 100644 --- a/quarkus/addons/python/integration-tests/pom.xml +++ b/quarkus/addons/python/integration-tests/pom.xml @@ -60,6 +60,10 @@ io.quarkus quarkus-resteasy-jackson + + + io.quarkus + quarkus-resteasy-client-oidc-filter 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 0e417293745..54e736f2ffb 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 @@ -85,7 +85,7 @@ io.quarkus - quarkus-resteasy-reactive-spi-deployment + quarkus-rest-server-spi-deployment io.quarkus 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 60d9efda1fc..fdcb5777629 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 @@ -113,6 +113,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + 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 3336f6660c2..31a223d4707 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 @@ -89,6 +89,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + 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 ec86ffab09f..bd519244976 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 @@ -98,6 +98,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + 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 5caf3a85a6e..ceac3864a24 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 @@ -84,11 +84,19 @@ io.quarkus - quarkus-rest-client-deployment + quarkus-resteasy-client-deployment io.quarkus - quarkus-rest-client-jackson-deployment + quarkus-resteasy-client-jackson-deployment + + + io.quarkus + quarkus-resteasy-common-deployment + + + io.quarkus + quarkus-apache-httpclient-deployment io.quarkus @@ -124,6 +132,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + 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 50fc7162730..6626278471a 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 @@ -57,11 +57,11 @@ io.quarkus - quarkus-rest-client + quarkus-resteasy-client io.quarkus - quarkus-rest-client-jackson + quarkus-resteasy-client-jackson io.quarkus @@ -82,7 +82,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging + quarkus-messaging io.quarkiverse.reactivemessaging.http @@ -182,6 +182,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + 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 cf9e3b9ea6d..ddb5c70ca81 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 @@ -95,6 +95,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + From b3757fc0a477b43ee9010ffc81c6a06f114ef0c2 Mon Sep 17 00:00:00 2001 From: Rishiraj Anand Date: Thu, 21 Nov 2024 12:29:33 +0530 Subject: [PATCH 2/4] Fix errors due to flyway 10 upgrade --- addons/common/flyway/pom.xml | 5 ++++- quarkus/addons/dynamic/integration-tests/pom.xml | 4 ++++ .../pom.xml | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/addons/common/flyway/pom.xml b/addons/common/flyway/pom.xml index 6a79414f19a..22c7af868a9 100644 --- a/addons/common/flyway/pom.xml +++ b/addons/common/flyway/pom.xml @@ -41,7 +41,10 @@ org.flywaydb flyway-core - + + org.flywaydb + flyway-database-postgresql + org.slf4j slf4j-api diff --git a/quarkus/addons/dynamic/integration-tests/pom.xml b/quarkus/addons/dynamic/integration-tests/pom.xml index fc2b6b13058..47d82d0df90 100644 --- a/quarkus/addons/dynamic/integration-tests/pom.xml +++ b/quarkus/addons/dynamic/integration-tests/pom.xml @@ -34,6 +34,10 @@ io.quarkus quarkus-resteasy-jackson + + + io.quarkus + quarkus-resteasy-client-oidc-filter io.quarkus 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 6fdd85df373..de88c98fb59 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 @@ -49,6 +49,10 @@ io.quarkus quarkus-resteasy-jackson + + io.quarkus + quarkus-resteasy-client-oidc-filter + io.quarkus quarkus-smallrye-openapi From 2f2dd0005f47525afe3b50e88cbc242ccaf92e0a Mon Sep 17 00:00:00 2001 From: Rishiraj Anand Date: Thu, 21 Nov 2024 18:30:13 +0530 Subject: [PATCH 3/4] Fix infinispan protostream errors due to upgrade --- .../AbstractMarshallerGenerator.java | 2 +- .../proto/ReflectionProtoGenerator.java | 2 +- .../proto/AbstractProtoGeneratorTest.java | 18 +++++++++--------- .../addons/dynamic/integration-tests/pom.xml | 4 ---- .../pom.xml | 2 +- .../deployment/JandexProtoGenerator.java | 2 +- 6 files changed, 13 insertions(+), 17 deletions(-) diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGenerator.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGenerator.java index cb4649373af..42d9cd10412 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGenerator.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGenerator.java @@ -201,7 +201,7 @@ public List generate(FileDescriptorSource proto) throws IOExcep } if (customTypeName.equals(Serializable.class.getName())) { - String fieldClazz = field.getOptionByName(KOGITO_JAVA_CLASS_OPTION).getName(); + String fieldClazz = (String) field.getOptionByName(KOGITO_JAVA_CLASS_OPTION).getValue(); if (fieldClazz == null) { throw new IllegalArgumentException(format("Serializable proto field '%s' is missing value for option %s", field.getName(), KOGITO_JAVA_CLASS_OPTION)); } else { diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/persistence/proto/ReflectionProtoGenerator.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/persistence/proto/ReflectionProtoGenerator.java index 730ed02dd34..c67c538192a 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/persistence/proto/ReflectionProtoGenerator.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/persistence/proto/ReflectionProtoGenerator.java @@ -120,7 +120,7 @@ protected ProtoMessage messageFromClass(Proto proto, Set alreadyGenerate ProtoField protoField = message.addField(computeCardinalityModifier(fieldTypeString), protoType, pd.getName()); protoField.setComment(completeFieldComment); if (KOGITO_SERIALIZABLE.equals(protoType)) { - protoField.setOption(format("[(%s) = \"%s\"]", KOGITO_JAVA_CLASS_OPTION, pd.getPropertyType().getCanonicalName())); + protoField.setOption(format("[%s = \"%s\"]", KOGITO_JAVA_CLASS_OPTION, pd.getPropertyType().getCanonicalName())); } } message.setComment(messageComment); diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/process/persistence/proto/AbstractProtoGeneratorTest.java b/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/process/persistence/proto/AbstractProtoGeneratorTest.java index c72835fdc5b..022bd794a76 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/process/persistence/proto/AbstractProtoGeneratorTest.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/process/persistence/proto/AbstractProtoGeneratorTest.java @@ -369,7 +369,7 @@ private void asserPersonProto(ProtoMessage person) { assertThat(field.getType()).isEqualTo("kogito.Serializable"); assertThat(field.getApplicability()).isEqualTo("optional"); assertThat(field.getComment()).isEqualTo("@Field(index = Index.YES, store = Store.YES) @SortableField"); - assertThat(field.getOption()).isEqualTo("[(kogito_java_class) = \"java.math.BigDecimal\"]"); + assertThat(field.getOption()).isEqualTo("[kogito_java_class = \"java.math.BigDecimal\"]"); field = person.getFields().get(index++); assertThat(field).isNotNull(); @@ -391,7 +391,7 @@ private void asserPersonProto(ProtoMessage person) { assertThat(field.getType()).isEqualTo("kogito.Serializable"); assertThat(field.getApplicability()).isEqualTo("optional"); assertThat(field.getComment()).isEqualTo("@Field(index = Index.YES, store = Store.YES) @SortableField"); - assertThat(field.getOption()).isEqualTo("[(kogito_java_class) = \"java.time.Duration\"]"); + assertThat(field.getOption()).isEqualTo("[kogito_java_class = \"java.time.Duration\"]"); field = person.getFields().get(index++); assertThat(field).isNotNull(); @@ -399,7 +399,7 @@ private void asserPersonProto(ProtoMessage person) { assertThat(field.getType()).isEqualTo("kogito.Serializable"); assertThat(field.getApplicability()).isEqualTo("repeated"); assertThat(field.getComment()).isEqualTo("@Field(index = Index.YES, store = Store.YES) @SortableField"); - assertThat(field.getOption()).isEqualTo("[(kogito_java_class) = \"org.kie.kogito.codegen.data.Money[]\"]"); + assertThat(field.getOption()).isEqualTo("[kogito_java_class = \"org.kie.kogito.codegen.data.Money[]\"]"); field = person.getFields().get(index++); assertThat(field).isNotNull(); @@ -407,7 +407,7 @@ private void asserPersonProto(ProtoMessage person) { assertThat(field.getType()).isEqualTo("kogito.Serializable"); assertThat(field.getApplicability()).isEqualTo("repeated"); assertThat(field.getComment()).isEqualTo("@Field(index = Index.YES, store = Store.YES) @SortableField"); - assertThat(field.getOption()).isEqualTo("[(kogito_java_class) = \"java.util.List\"]"); + assertThat(field.getOption()).isEqualTo("[kogito_java_class = \"java.util.List\"]"); field = person.getFields().get(index++); assertThat(field).isNotNull(); @@ -429,7 +429,7 @@ private void asserPersonProto(ProtoMessage person) { assertThat(field.getType()).isEqualTo("kogito.Serializable"); assertThat(field.getApplicability()).isEqualTo("optional"); assertThat(field.getComment()).isEqualTo("@Field(index = Index.YES, store = Store.YES) @SortableField"); - assertThat(field.getOption()).isEqualTo("[(kogito_java_class) = \"java.time.LocalDate\"]"); + assertThat(field.getOption()).isEqualTo("[kogito_java_class = \"java.time.LocalDate\"]"); field = person.getFields().get(index++); assertThat(field).isNotNull(); @@ -437,7 +437,7 @@ private void asserPersonProto(ProtoMessage person) { assertThat(field.getType()).isEqualTo("kogito.Serializable"); assertThat(field.getApplicability()).isEqualTo("optional"); assertThat(field.getComment()).isEqualTo("@Field(index = Index.YES, store = Store.YES) @SortableField"); - assertThat(field.getOption()).isEqualTo("[(kogito_java_class) = \"java.time.LocalDateTime\"]"); + assertThat(field.getOption()).isEqualTo("[kogito_java_class = \"java.time.LocalDateTime\"]"); field = person.getFields().get(index++); assertThat(field).isNotNull(); @@ -452,7 +452,7 @@ private void asserPersonProto(ProtoMessage person) { assertThat(field.getType()).isEqualTo("kogito.Serializable"); assertThat(field.getApplicability()).isEqualTo("optional"); assertThat(field.getComment()).isEqualTo("@Field(index = Index.YES, store = Store.YES) @SortableField"); - assertThat(field.getOption()).isEqualTo("[(kogito_java_class) = \"java.time.OffsetDateTime\"]"); + assertThat(field.getOption()).isEqualTo("[kogito_java_class = \"java.time.OffsetDateTime\"]"); field = person.getFields().get(index++); assertThat(field).isNotNull(); @@ -474,7 +474,7 @@ private void asserPersonProto(ProtoMessage person) { assertThat(field.getType()).isEqualTo("kogito.Serializable"); assertThat(field.getApplicability()).isEqualTo("optional"); assertThat(field.getComment()).isEqualTo("@Field(index = Index.YES, store = Store.YES) @SortableField"); - assertThat(field.getOption()).isEqualTo("[(kogito_java_class) = \"org.kie.kogito.codegen.data.Money\"]"); + assertThat(field.getOption()).isEqualTo("[kogito_java_class = \"org.kie.kogito.codegen.data.Money\"]"); field = person.getFields().get(index++); assertThat(field).isNotNull(); @@ -482,7 +482,7 @@ private void asserPersonProto(ProtoMessage person) { assertThat(field.getType()).isEqualTo("kogito.Serializable"); assertThat(field.getApplicability()).isEqualTo("optional"); assertThat(field.getComment()).isEqualTo("@Field(index = Index.YES, store = Store.YES) @SortableField"); - assertThat(field.getOption()).isEqualTo("[(kogito_java_class) = \"java.time.ZonedDateTime\"]"); + assertThat(field.getOption()).isEqualTo("[kogito_java_class = \"java.time.ZonedDateTime\"]"); } @Test diff --git a/quarkus/addons/dynamic/integration-tests/pom.xml b/quarkus/addons/dynamic/integration-tests/pom.xml index 47d82d0df90..fa3497cb94f 100644 --- a/quarkus/addons/dynamic/integration-tests/pom.xml +++ b/quarkus/addons/dynamic/integration-tests/pom.xml @@ -23,10 +23,6 @@ org.kie kie-addons-quarkus-process-dynamic - - io.quarkus - quarkus-oidc-client-filter - io.quarkus quarkus-resteasy 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 bb0da68a8fb..37ffdec9723 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 @@ -56,7 +56,7 @@ io.quarkus - quarkus-oidc-client-filter + quarkus-resteasy-client-oidc-filter io.quarkus diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common-deployment/src/main/java/org/kie/kogito/quarkus/workflow/deployment/JandexProtoGenerator.java b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common-deployment/src/main/java/org/kie/kogito/quarkus/workflow/deployment/JandexProtoGenerator.java index 08ac15a972f..f73d821a67a 100644 --- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common-deployment/src/main/java/org/kie/kogito/quarkus/workflow/deployment/JandexProtoGenerator.java +++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common-deployment/src/main/java/org/kie/kogito/quarkus/workflow/deployment/JandexProtoGenerator.java @@ -174,7 +174,7 @@ protected ProtoMessage messageFromClass(Proto proto, Set alreadyGenerate ProtoField protoField = message.addField(computeCardinalityModifier(fieldTypeString), protoType, pd.name()); protoField.setComment(completeFieldComment); if (KOGITO_SERIALIZABLE.equals(protoType)) { - protoField.setOption(format("[(%s) = \"%s\"]", KOGITO_JAVA_CLASS_OPTION, fieldTypeString.equals(ARRAY) ? pd.type().toString() : pd.type().name().toString())); + protoField.setOption(format("[%s = \"%s\"]", KOGITO_JAVA_CLASS_OPTION, fieldTypeString.equals(ARRAY) ? pd.type().toString() : pd.type().name().toString())); } } message.setComment(messageComment); From a338eb3d9a1ab3f117a548233f920e8598233ffd Mon Sep 17 00:00:00 2001 From: Rishiraj Anand Date: Fri, 22 Nov 2024 11:35:22 +0530 Subject: [PATCH 4/4] Align kubernetes-client version to quarkus supported version 6.13.3 --- kogito-build/kogito-dependencies-bom/pom.xml | 4 ++-- quarkus/bom/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-dependencies-bom/pom.xml index bd8964bb678..0e4ce553a83 100644 --- a/kogito-build/kogito-dependencies-bom/pom.xml +++ b/kogito-build/kogito-dependencies-bom/pom.xml @@ -78,11 +78,11 @@ Don't add as a management dependency because it will break SpringBoot and Quarkus Kubernetes addons since they use a different version. --> - 6.10.0 + 6.13.3 1.12.2 10.17.3 42.7.4 - 2.2.220 + 2.3.230 4.0.5.Final 3.10.0 diff --git a/quarkus/bom/pom.xml b/quarkus/bom/pom.xml index 2532c6a27ab..b2bdef86e5b 100755 --- a/quarkus/bom/pom.xml +++ b/quarkus/bom/pom.xml @@ -37,7 +37,7 @@ Internal BOM descriptor for Kogito modules targeting Quarkus use-cases. Specific dependencies targeting the Quarkus platform must be added here. - 6.10.0 + 6.13.3