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 26fae00aa0d..3ba1ab0b42d 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 @@ -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 @@ -112,7 +112,7 @@ 24.0.4 2.12-2.2.1 - 4.11.1 + 5.1.4 4.4.14 1.7.13 2.0.4 @@ -128,7 +128,7 @@ 5.10.2 1.10.2 5.8.0 - 1.19.6 + 1.20.1 2.10.0 5.4.0 @@ -721,7 +721,7 @@ org.infinispan - infinispan-client-hotrod-jakarta + infinispan-client-hotrod ${version.org.infinispan} 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/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/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 1e6eefccdc8..825096b9f9b 100644 --- a/quarkus/addons/flyway/deployment/pom.xml +++ b/quarkus/addons/flyway/deployment/pom.xml @@ -74,6 +74,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/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/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/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/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/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 8da03ff0f7b..098c0d745fe 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,12 +57,12 @@ io.quarkus - quarkus-rest-client + quarkus-resteasy-client io.quarkus - quarkus-rest-client-jackson + quarkus-resteasy-client-jackson @@ -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 +