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/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-build-no-bom-parent/pom.xml b/kogito-build/kogito-build-no-bom-parent/pom.xml index 2795ef00b81..bd3a00e40d3 100644 --- a/kogito-build/kogito-build-no-bom-parent/pom.xml +++ b/kogito-build/kogito-build-no-bom-parent/pom.xml @@ -111,7 +111,7 @@ 3.0.0 3.6.1.1688 3.2.1 - 3.1.2 + 3.3.1 3.1.2 2.4 - 3.8.6 + 3.15.2 ${version.io.quarkus} 3.2.6 - 3.7.0 + 3.7.1 1.78.1 @@ -51,20 +51,20 @@ 2.4.10 1.0.0-preview.20240207 2.0.2 - 2.4.1 + 2.7.0-lts 0.3.0 2.4.1 0.2.3 1.5.2 - 3.25.8 + 3.26.1 2.17.2 4.31.0 - 2.35.1 + 2.35.2 3.25.5 2.10.1 - 4.0.4 + 4.0.5 2.0.1 2.0.1 3.1.1 @@ -79,22 +79,21 @@ 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 - 9.22.3 - 42.7.2 - 2.2.220 + 10.17.3 + 42.7.4 + 2.3.232 4.0.5.Final - 3.10.0 4.2.0 3.11.0 - 4.5.7 + 4.5.10 1.59.1 - 3.9.0 + 3.15.1 2.1.19 2.2.19 @@ -103,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 +111,7 @@ 3.1.0 6.2.7.Final - 24.0.4 + 25.0.6 2.12-2.2.1 4.11.1 @@ -121,7 +120,7 @@ 2.0.4 15.9-alpine3.20 - 1.11.4 + 1.12.0 3.24.2 4.0.4 2.9.0 @@ -131,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 @@ -738,7 +737,11 @@ flyway-core ${version.org.flywaydb} - + + org.flywaydb + flyway-database-postgresql + ${version.org.flywaydb} + org.infinispan @@ -747,7 +750,7 @@ org.infinispan - infinispan-client-hotrod-jakarta + infinispan-client-hotrod ${version.org.infinispan} @@ -765,7 +768,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/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..26cfd1c7ca4 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 @@ -228,7 +228,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 = (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 { @@ -317,7 +317,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/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/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/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/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 2fca76b377f..28e5a38e3ba 100644 --- a/quarkus/addons/dynamic/integration-tests/pom.xml +++ b/quarkus/addons/dynamic/integration-tests/pom.xml @@ -50,6 +50,10 @@ under the License. io.quarkus quarkus-resteasy-jackson + + + io.quarkus + quarkus-resteasy-client-oidc-filter io.quarkus 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/mail/deployment/pom.xml b/quarkus/addons/mail/deployment/pom.xml index 11d5003a2fe..a7f3864abf0 100644 --- a/quarkus/addons/mail/deployment/pom.xml +++ b/quarkus/addons/mail/deployment/pom.xml @@ -37,7 +37,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka-deployment + quarkus-messaging-kafka-deployment org.kie diff --git a/quarkus/addons/mail/runtime/pom.xml b/quarkus/addons/mail/runtime/pom.xml index 76150fdc4cd..f2bfee1b99e 100644 --- a/quarkus/addons/mail/runtime/pom.xml +++ b/quarkus/addons/mail/runtime/pom.xml @@ -43,7 +43,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka io.quarkus diff --git a/quarkus/addons/messaging/integration-tests/pom.xml b/quarkus/addons/messaging/integration-tests/pom.xml index 91263455c03..781539bbe57 100644 --- a/quarkus/addons/messaging/integration-tests/pom.xml +++ b/quarkus/addons/messaging/integration-tests/pom.xml @@ -54,7 +54,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka diff --git a/quarkus/addons/microprofile-config-service-catalog/deployment/pom.xml b/quarkus/addons/microprofile-config-service-catalog/deployment/pom.xml index 8223eba7f36..e45895e4622 100644 --- a/quarkus/addons/microprofile-config-service-catalog/deployment/pom.xml +++ b/quarkus/addons/microprofile-config-service-catalog/deployment/pom.xml @@ -63,6 +63,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml b/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml index 089aa2507f5..a5a3dc15915 100644 --- a/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml +++ b/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml @@ -100,6 +100,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/addons/source-files/runtime/pom.xml b/quarkus/addons/source-files/runtime/pom.xml index 634a43a7c80..09c8542d348 100644 --- a/quarkus/addons/source-files/runtime/pom.xml +++ b/quarkus/addons/source-files/runtime/pom.xml @@ -150,6 +150,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/tracing-decision/deployment/pom.xml b/quarkus/addons/tracing-decision/deployment/pom.xml index 0b36d625754..85513b3b1fb 100644 --- a/quarkus/addons/tracing-decision/deployment/pom.xml +++ b/quarkus/addons/tracing-decision/deployment/pom.xml @@ -59,7 +59,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka-deployment + quarkus-messaging-kafka-deployment @@ -97,6 +97,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/tracing-decision/runtime/pom.xml b/quarkus/addons/tracing-decision/runtime/pom.xml index c458dc1aebf..46d2537090e 100644 --- a/quarkus/addons/tracing-decision/runtime/pom.xml +++ b/quarkus/addons/tracing-decision/runtime/pom.xml @@ -43,7 +43,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka @@ -135,6 +135,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/bom/pom.xml b/quarkus/bom/pom.xml index 2532c6a27ab..fe3db0e4978 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 @@ -84,6 +84,11 @@ quarkus-openapi-generator-deployment ${version.io.quarkiverse.openapi.generator} + + io.quarkiverse.openapi.generator + quarkus-openapi-generator-oidc + ${version.io.quarkiverse.openapi.generator} + io.quarkiverse.asyncapi quarkus-asyncapi 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 bc91f46e926..1641e6accae 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 @@ -66,6 +66,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + 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 14bdfbb77cc..75bde690f0b 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 @@ -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..bed254526f3 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 @@ -153,6 +153,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + 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-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 8cd8329586a..8a3d3ac6602 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 @@ -40,7 +40,7 @@ public class ConfigBean extends StaticConfigBean { Instance buildTimeConfig; @Inject - KogitoGAV gav; + Instance gav; @Override public String getServiceUrl() { @@ -54,7 +54,7 @@ public short processInstanceLimit() { @Override public Optional getGav() { - return Optional.ofNullable(gav); + return Optional.ofNullable(gav.get()); } @Override 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 9350eabc4ce..56ce82e0ede 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 @@ -21,6 +21,7 @@ import java.util.Optional; import org.kie.kogito.Application; +import org.kie.kogito.StaticApplication; import org.kie.kogito.process.Processes; import org.kie.kogito.quarkus.config.KogitoRuntimeConfig; import org.kie.kogito.services.registry.ProcessDefinitionEventRegistry; @@ -40,10 +41,11 @@ public class ProcessDefinitionRegistration { ProcessDefinitionEventRegistry processDefinitionRegistry; @Inject - public ProcessDefinitionRegistration(Application application, KogitoRuntimeConfig runtimeConfig, Instance processes, Instance sourceFilesProvider) { + public ProcessDefinitionRegistration(Instance application, KogitoRuntimeConfig runtimeConfig, Instance processes, Instance sourceFilesProvider) { this.processes = processes; this.processDefinitionRegistry = - new ProcessDefinitionEventRegistry(application, runtimeConfig.serviceUrl.orElse(null), sourceFilesProvider.isResolvable() ? Optional.of(sourceFilesProvider.get()) : Optional.empty()); + new ProcessDefinitionEventRegistry(application.isResolvable() ? application.get() : (new StaticApplication()), runtimeConfig.serviceUrl.orElse(null), + sourceFilesProvider.isResolvable() ? Optional.of(sourceFilesProvider.get()) : Optional.empty()); } void onStartUp(@Observes StartupEvent startupEvent) { 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 8d524df2b23..fdb9a76aa56 100644 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-deployment/pom.xml +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-deployment/pom.xml @@ -95,6 +95,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + 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 40c8819673b..ef84dfa58b6 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 @@ -30,7 +30,7 @@ 999-SNAPSHOT - jbpm-sith-drools-quarkus-integration-test-maven-devmode + jbpm-with-drools-quarkus-integration-test-maven-devmode jBPM with Drools :: Quarkus Extension :: Integration Tests (Maven devmode) diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/java/io/quarkus/it/kogito/devmode/DevMojoIT.java b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/java/io/quarkus/it/kogito/devmode/DevMojoIT.java index c8edef6f27c..578cac79265 100644 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/java/io/quarkus/it/kogito/devmode/DevMojoIT.java +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/java/io/quarkus/it/kogito/devmode/DevMojoIT.java @@ -41,7 +41,7 @@ import io.quarkus.maven.it.RunAndCheckMojoTestBase; import io.quarkus.maven.it.verifier.MavenProcessInvoker; import io.quarkus.maven.it.verifier.RunningInvoker; -import io.quarkus.test.devmode.util.DevModeTestUtils; +import io.quarkus.test.devmode.util.DevModeClient; import io.restassured.RestAssured; import io.restassured.http.ContentType; @@ -89,11 +89,12 @@ public class DevMojoIT extends RunAndCheckMojoTestBase { private String getRestResponse(String port) { AtomicReference resp = new AtomicReference<>(); + DevModeClient devModeClient = new DevModeClient(Integer.parseInt(port)); // retry on exceptions for connection refused, connection errors, etc. which will occur until the Kogito Quarkus maven project is fully built and running await().pollDelay(INIT_POLL_DELAY, INIT_POLL_DELAY_UNIT) .atMost(INIT_POLL_TIMEOUT, INIT_POLL_TIMEOUT_UNIT).until(() -> { try { - String content = DevModeTestUtils.get("http://localhost:" + port + "/control"); + String content = devModeClient.get("http://localhost:" + port + "/control"); resp.set(content); return true; } catch (Exception e) { @@ -135,6 +136,8 @@ protected void run(boolean performCompile, String... options) throws MavenInvoca args.add("-Djvm.args=-Xmx1024m"); // Disable devservices args.add("-Dquarkus.kogito.devservices.enabled=false"); + args.add("-Dquarkus.analytics.disabled=true"); + // Let Quarkus figure a random port args.add("-Dquarkus.http.port=0"); args.addAll(getProvidedMavenProperties()); @@ -222,7 +225,7 @@ private List getProvidedMavenProperties() { @Test public void testBPMN2HotReload() throws Exception { - testDir = initProject("projects/classic-inst", "projects/project-intrumentation-reload-bpmn"); + testDir = initProject("projects/classic-inst", "projects/project-instrumentation-reload-bpmn"); String httpPort = run("testBPMN2HotReload"); assertThat(httpPort).isNotEmpty(); @@ -297,7 +300,7 @@ public void testBPMN2HotReload() throws Exception { @Test public void testDMNHotReload() throws Exception { - testDir = initProject("projects/classic-inst", "projects/project-intrumentation-reload-dmn"); + testDir = initProject("projects/classic-inst", "projects/project-instrumentation-reload-dmn"); final String httpPort = run("testDMNHotReload"); final File controlSource = new File(testDir, "src/main/java/control/RestControl.java"); @@ -368,7 +371,7 @@ public void testDMNHotReload() throws Exception { @Test public void testDRLHotReload() throws Exception { - testDir = initProject("projects/classic-inst", "projects/project-intrumentation-reload-drl"); + testDir = initProject("projects/classic-inst", "projects/project-instrumentation-reload-drl"); final String httpPort = run("testDRLHotReload"); final File controlSource = new File(testDir, "src/main/java/control/RestControl.java"); diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml index 60e22aff45e..7b8669038f0 100644 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml @@ -99,6 +99,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + 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 0008e0846fb..ac0e4499054 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 @@ -66,6 +66,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + 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 4680bc30360..f7432541b95 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 @@ -95,6 +95,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + 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 60533728264..b1f2fef2c0f 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 @@ -83,6 +83,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + 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 c93fe7c1cd3..94220228ad4 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 @@ -94,6 +94,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-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..82eb2e1fd32 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 @@ -61,7 +65,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka 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..5c50fb2448d 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,11 +56,11 @@ io.quarkus - quarkus-oidc-client-filter + quarkus-resteasy-client-oidc-filter io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/application.properties b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/application.properties index 24a07fd6c3d..7325b53a821 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/application.properties +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/application.properties @@ -37,7 +37,7 @@ quarkus.kafka.devservices.enabled=false quarkus.kubernetes-client.devservices.enabled=false # OpenApi client properties, see OperationsMockService, which is mocking these two services -quarkus.rest-client.multiplication.cluster1.url=${multiplication-service-mock.url} +quarkus.rest-client."multiplication.cluster1".url=${multiplication-service-mock.url} quarkus.rest-client.subtraction.url=${subtraction-service-mock.url} quarkus.rest-client.petstore_openapi_yaml.url=${petstore-service-mock.url} quarkus.rest-client.array_yaml.url=${array-service-mock.url} @@ -255,4 +255,4 @@ quarkus.http.auth.permission.default.policy=authenticated quarkus.security.users.embedded.enabled=true quarkus.security.users.embedded.plain-text=true -quarkus.security.users.embedded.users.buddy=buddy \ No newline at end of file +quarkus.security.users.embedded.users.buddy=buddy 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..d45bbd8d550 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 @@ -116,6 +116,10 @@ io.quarkiverse.openapi.generator quarkus-openapi-generator + + io.quarkiverse.openapi.generator + quarkus-openapi-generator-oidc + io.quarkiverse.asyncapi quarkus-asyncapi @@ -182,6 +186,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + 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 6a021fdaa8c..4d206108142 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 @@ -18,7 +18,6 @@ */ package org.kie.kogito.serverless.workflow.openapi; -import java.io.IOException; import java.lang.reflect.ParameterizedType; import java.util.Collections; import java.util.Map; @@ -37,7 +36,6 @@ 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 { @@ -45,12 +43,9 @@ public abstract class OpenApiWorkItemHandler extends WorkflowWorkItemHandler @Override protected Object internalExecute(KogitoWorkItem workItem, Map parameters) { Class clazz = getRestClass(); - T ref = RestClientBuilderFactory.build(clazz, calculatedConfigKey(workItem, parameters)).register(new ClientRequestFilter() { - @Override - public void filter(ClientRequestContext requestContext) throws IOException { - ProcessMeta.fromKogitoWorkItem(workItem).asMap().forEach((k, v) -> requestContext.getHeaders().put(k, Collections.singletonList(v))); - } - }).build(clazz); + T ref = RestClientBuilderFactory.build(clazz, calculatedConfigKey(workItem)).register( + (ClientRequestFilter) requestContext -> ProcessMeta.fromKogitoWorkItem(workItem).asMap().forEach((k, v) -> requestContext.getHeaders().put(k, Collections.singletonList(v)))) + .build(clazz); try { return internalExecute(ref, parameters); } catch (WebApplicationException ex) { @@ -58,7 +53,7 @@ public void filter(ClientRequestContext requestContext) throws IOException { } } - private Optional calculatedConfigKey(KogitoWorkItem workItem, Map parameters) { + private Optional calculatedConfigKey(KogitoWorkItem workItem) { String configKeyExpr = (String) workItem.getNodeInstance().getNode().getMetaData().get("configKey"); if (configKeyExpr == null) { return Optional.empty(); @@ -78,4 +73,4 @@ protected Class getRestClass() { // this does not work in quarkus dev mode, overriding through generation return (Class) ((ParameterizedType) this.getClass().getGenericSuperclass()).getActualTypeArguments()[0]; } -} +} \ No newline at end of file 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 + 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); diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml index aa39bc275b6..9a4ce39b569 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml @@ -91,7 +91,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka io.quarkus