This is an automated email from the ASF dual-hosted git repository.
tiagobento pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 4853cd035b1 kie-issues#1908: Upgrade Quarkus from `3.15 (LTS)` to
`3.20 (LTS)` (bumping Drools and Kogito to `2025-06-22` too) (#3187)
4853cd035b1 is described below
commit 4853cd035b1a1b4ef16e391e595740aa59aae101
Author: Tiago Bento <[email protected]>
AuthorDate: Wed Jul 9 17:45:07 2025 -0400
kie-issues#1908: Upgrade Quarkus from `3.15 (LTS)` to `3.20 (LTS)` (bumping
Drools and Kogito to `2025-06-22` too) (#3187)
---
devbox.json | 5 +--
examples/process-event-driven/README.md | 2 +-
examples/process-event-driven/hotels/pom.xml | 2 +-
examples/process-event-driven/travelers/pom.xml | 2 +-
examples/process-security/kie-service-1/pom.xml | 2 +-
examples/process-security/kie-service-2/pom.xml | 2 +-
packages/dev-deployment-quarkus-blank-app/pom.xml | 4 +--
packages/drools-and-kogito/env/index.js | 8 ++---
.../devui/deployment/DevConsoleProcessor.java | 17 +++++-----
.../kogito-data-index-ephemeral-image/env/index.js | 1 +
.../kogito-data-index-ephemeral-image/install.js | 1 +
.../env/index.js | 1 +
.../kogito-data-index-postgresql-image/install.js | 1 +
.../kogito-common-postresql-services.feature | 11 ++++---
packages/kogito-jit-runner-image/env/index.js | 1 +
packages/kogito-jit-runner-image/install.js | 1 +
.../env/index.js | 1 +
.../kogito-jobs-service-ephemeral-image/install.js | 1 +
.../env/index.js | 1 +
.../install.js | 1 +
.../kogito-jobs-service-postgresql.feature | 15 +++++----
packages/maven-base/pom.xml | 12 +++----
packages/root-env/env/index.js | 4 +--
.../README.md | 2 +-
.../dev-webapp/secured-runtime/pom.xml | 2 +-
.../dev-webapp/unsecured-runtime/pom.xml | 2 +-
.../controller/platform/db_migrator_job.go | 37 +++++++++++++++-------
.../profiles/common/object_creators_test.go | 20 ++++++++++++
.../profiles/common/persistence/postgresql.go | 7 ++++
.../sonataflowplatform_controller_test.go | 10 ++++++
.../swf/tools/deployment/DevConsoleProcessor.java | 17 +++++-----
repo/KOGITO_UPGRADE_PROCESS.md | 2 +-
32 files changed, 129 insertions(+), 66 deletions(-)
diff --git a/devbox.json b/devbox.json
index 1d4c8a613f2..c6a2daeadf1 100644
--- a/devbox.json
+++ b/devbox.json
@@ -24,10 +24,7 @@
"PATH":
"$DEVBOX_PROJECT_ROOT/.devbox/gopkgs/bin:$DEVBOX_PROJECT_ROOT/.devbox/pnpm-store:$PATH"
},
"shell": {
- "init_hook": [
- ". $VENV_DIR/bin/activate",
- "[[ $OSTYPE == 'darwin'* ]] && export PATH=$(echo $PATH | tr ':' '\n' |
grep -vi 'xcode\\|clang\\|cctools' | paste -sd ':' -)"
- ],
+ "init_hook": [". $VENV_DIR/bin/activate"],
"scripts": {
"versions": [
"java --version && mvn -v && node -v && pnpm -v && go version && helm
version && make -v && python3 --version && pip3 --version"
diff --git a/examples/process-event-driven/README.md
b/examples/process-event-driven/README.md
index 2a26976cb92..4b4059f171d 100644
--- a/examples/process-event-driven/README.md
+++ b/examples/process-event-driven/README.md
@@ -34,7 +34,7 @@ To enable events we must configure our project by adding
Maven dependencies to t
To enable Kafka messages we must add the following two dependencies in the
`pom.xml` file:
- `org.kie.kie-addons-quarkus-messaging`: Quarkus addon that enables Apache
KIE runtime to produce and consume messages using the Smallrye Messaging
library.
-- `io.quarkus.quarkus-smallrye-reactive-messaging-kafka`: Enables connecting
Kafka broker using the Smallrye Messaging library for Quarkus.
+- `io.quarkus.quarkus-messaging-kafka`: Enables connecting Kafka broker using
the Smallrye Messaging library for Quarkus.
### Application properties
diff --git a/examples/process-event-driven/hotels/pom.xml
b/examples/process-event-driven/hotels/pom.xml
index 00647497fc4..2b0b9a62fbe 100644
--- a/examples/process-event-driven/hotels/pom.xml
+++ b/examples/process-event-driven/hotels/pom.xml
@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-smallrye-reactive-messaging-kafka</artifactId>
+ <artifactId>quarkus-messaging-kafka</artifactId>
</dependency>
</dependencies>
diff --git a/examples/process-event-driven/travelers/pom.xml
b/examples/process-event-driven/travelers/pom.xml
index 72828d93ed3..9b9a52d682f 100644
--- a/examples/process-event-driven/travelers/pom.xml
+++ b/examples/process-event-driven/travelers/pom.xml
@@ -53,7 +53,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-smallrye-reactive-messaging-kafka</artifactId>
+ <artifactId>quarkus-messaging-kafka</artifactId>
</dependency>
<dependency>
diff --git a/examples/process-security/kie-service-1/pom.xml
b/examples/process-security/kie-service-1/pom.xml
index 0e927da74d6..9531ad86ff1 100644
--- a/examples/process-security/kie-service-1/pom.xml
+++ b/examples/process-security/kie-service-1/pom.xml
@@ -122,7 +122,7 @@
<dependency>
<groupId>io.quarkiverse.oidc-proxy</groupId>
<artifactId>quarkus-oidc-proxy</artifactId>
- <version>0.1.2</version>
+ <version>0.2.2</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/examples/process-security/kie-service-2/pom.xml
b/examples/process-security/kie-service-2/pom.xml
index b6c9f03b676..efb6e4ca62b 100644
--- a/examples/process-security/kie-service-2/pom.xml
+++ b/examples/process-security/kie-service-2/pom.xml
@@ -122,7 +122,7 @@
<dependency>
<groupId>io.quarkiverse.oidc-proxy</groupId>
<artifactId>quarkus-oidc-proxy</artifactId>
- <version>0.1.2</version>
+ <version>0.2.2</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/packages/dev-deployment-quarkus-blank-app/pom.xml
b/packages/dev-deployment-quarkus-blank-app/pom.xml
index 114be03f593..53e7765ca25 100644
--- a/packages/dev-deployment-quarkus-blank-app/pom.xml
+++ b/packages/dev-deployment-quarkus-blank-app/pom.xml
@@ -57,11 +57,11 @@
<!-- 3rd party -->
<version.junit>4.13.2</version.junit>
-
<version.org.apache.commons.commons-compress>1.26.1</version.org.apache.commons.commons-compress>
+
<version.org.apache.commons.commons-compress>1.27.1</version.org.apache.commons.commons-compress>
<version.org.iq80.snappy>0.5</version.org.iq80.snappy>
<version.commons-io>2.16.1</version.commons-io>
<version.com.google.protobuf>3.25.5</version.com.google.protobuf>
- <version.io.netty>4.1.118.Final</version.io.netty>
+ <version.io.netty>4.1.121.Final</version.io.netty>
</properties>
<dependencyManagement>
diff --git a/packages/drools-and-kogito/env/index.js
b/packages/drools-and-kogito/env/index.js
index 4d8b8a27bf5..641e2285bf2 100644
--- a/packages/drools-and-kogito/env/index.js
+++ b/packages/drools-and-kogito/env/index.js
@@ -28,7 +28,7 @@ module.exports = composeEnv([rootEnv], {
description: "Git repository URL for Drools",
},
DROOLS_AND_KOGITO__droolsRepoGitRef: {
- default: "878fe13a914a8fe274dd0fcc5dda40290e2c0e2b",
+ default: "55ff044e20d3cc2222a525616152a9ee33725490",
description: "Git ref for the Drools repository (SHA, branch, or tag)",
},
DROOLS_AND_KOGITO__optaplannerRepoUrl: {
@@ -36,7 +36,7 @@ module.exports = composeEnv([rootEnv], {
description: "Git repository URL for OptaPlanner",
},
DROOLS_AND_KOGITO__optaplannerRepoGitRef: {
- default: "55b583cd4dfaf9185c316e12a94dc159b36e2708",
+ default: "c857b9532752d5066de3daa7585a90a4e0105fe0",
description: "Git ref for the OptaPlanner repository (SHA, branch, or
tag)",
},
DROOLS_AND_KOGITO__kogitoRuntimesRepoUrl: {
@@ -44,7 +44,7 @@ module.exports = composeEnv([rootEnv], {
description: "Git repository URL for Kogito Runtimes",
},
DROOLS_AND_KOGITO__kogitoRuntimesRepoGitRef: {
- default: "74159c722b1b4eb4a6f5ab70a7981bb5df93f136",
+ default: "c1e86c1d51e701df6434963a32b1127712a86f49",
description: "Git ref for the Kogito Runtimes repository (SHA, branch,
or tag)",
},
DROOLS_AND_KOGITO__kogitoAppsRepoUrl: {
@@ -52,7 +52,7 @@ module.exports = composeEnv([rootEnv], {
description: "Git repository URL for Kogito Apps",
},
DROOLS_AND_KOGITO__kogitoAppsRepoGitRef: {
- default: "0500270f74822858c717ee60e50c07dc18983fcb",
+ default: "b58453161115d5b7d232c51aacce76dbcd5f43b4",
description: "Git ref for the Kogito Apps repository (SHA, branch, or
tag)",
},
DROOLS_AND_KOGITO__skip: {
diff --git
a/packages/jbpm-quarkus-devui/jbpm-quarkus-devui-deployment/src/main/java/org/jbpm/quarkus/devui/deployment/DevConsoleProcessor.java
b/packages/jbpm-quarkus-devui/jbpm-quarkus-devui-deployment/src/main/java/org/jbpm/quarkus/devui/deployment/DevConsoleProcessor.java
index 056d7439f75..acd067b485a 100644
---
a/packages/jbpm-quarkus-devui/jbpm-quarkus-devui-deployment/src/main/java/org/jbpm/quarkus/devui/deployment/DevConsoleProcessor.java
+++
b/packages/jbpm-quarkus-devui/jbpm-quarkus-devui-deployment/src/main/java/org/jbpm/quarkus/devui/deployment/DevConsoleProcessor.java
@@ -30,6 +30,7 @@ import java.util.stream.Collectors;
import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
import jakarta.enterprise.context.ApplicationScoped;
import org.eclipse.microprofile.config.ConfigProvider;
+import org.eclipse.microprofile.config.ConfigValue;
import org.jboss.jandex.DotName;
import org.jbpm.quarkus.devui.runtime.rpc.events.JBPMDevUIEventPublisher;
import
org.kie.kogito.quarkus.extensions.spi.deployment.KogitoDataIndexServiceAvailableBuildItem;
@@ -196,29 +197,29 @@ public class DevConsoleProcessor {
private static String getProperty(ConfigurationBuildItem
configurationBuildItem,
List<SystemPropertyBuildItem>
systemPropertyBuildItems, String propertyKey) {
- String propertyValue = configurationBuildItem
+ ConfigValue propertyConfig = configurationBuildItem
.getReadResult()
.getAllBuildTimeValues()
.get(propertyKey);
- if (propertyValue == null) {
- propertyValue = configurationBuildItem
+ if (propertyConfig == null) {
+ propertyConfig = configurationBuildItem
.getReadResult()
.getBuildTimeRunTimeValues()
.get(propertyKey);
} else {
- return propertyValue;
+ return propertyConfig.getValue();
}
- if (propertyValue == null) {
- propertyValue = configurationBuildItem
+ if (propertyConfig == null) {
+ propertyConfig = configurationBuildItem
.getReadResult()
.getRunTimeDefaultValues()
.get(propertyKey);
}
- if (propertyValue != null) {
- return propertyValue;
+ if (propertyConfig != null) {
+ return propertyConfig.getValue();
}
return systemPropertyBuildItems.stream().filter(property ->
property.getKey().equals(propertyKey))
diff --git a/packages/kogito-data-index-ephemeral-image/env/index.js
b/packages/kogito-data-index-ephemeral-image/env/index.js
index dac66a5d91b..4c74e5abf5e 100644
--- a/packages/kogito-data-index-ephemeral-image/env/index.js
+++ b/packages/kogito-data-index-ephemeral-image/env/index.js
@@ -48,6 +48,7 @@ module.exports = composeEnv([rootEnv,
sonataflowImageCommonEnv], {
account:
getOrDefault(this.vars.KOGITO_DATA_INDEX_EPHEMERAL_IMAGE__account),
name: getOrDefault(this.vars.KOGITO_DATA_INDEX_EPHEMERAL_IMAGE__name),
buildTag:
getOrDefault(this.vars.KOGITO_DATA_INDEX_EPHEMERAL_IMAGE__buildTag),
+ version: require("../package.json").version,
},
};
},
diff --git a/packages/kogito-data-index-ephemeral-image/install.js
b/packages/kogito-data-index-ephemeral-image/install.js
index f5dcd31a8e4..df6fadd98d5 100644
--- a/packages/kogito-data-index-ephemeral-image/install.js
+++ b/packages/kogito-data-index-ephemeral-image/install.js
@@ -34,5 +34,6 @@ runKogitoImageInstall({
const { setupMavenConfigFile, buildTailFromPackageJsonDependencies } =
require("@kie-tools/maven-base");
setupMavenConfigFile(`
+ -Drevision=${env.kogitoDataIndexEphemeralImage.version}
-Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()}
`);
diff --git a/packages/kogito-data-index-postgresql-image/env/index.js
b/packages/kogito-data-index-postgresql-image/env/index.js
index a886932bd53..037f7c82bb8 100644
--- a/packages/kogito-data-index-postgresql-image/env/index.js
+++ b/packages/kogito-data-index-postgresql-image/env/index.js
@@ -48,6 +48,7 @@ module.exports = composeEnv([rootEnv,
sonataflowImageCommonEnv], {
account:
getOrDefault(this.vars.KOGITO_DATA_INDEX_POSTGRESQL_IMAGE__account),
name: getOrDefault(this.vars.KOGITO_DATA_INDEX_POSTGRESQL_IMAGE__name),
buildTag:
getOrDefault(this.vars.KOGITO_DATA_INDEX_POSTGRESQL_IMAGE__buildTag),
+ version: require("../package.json").version,
},
};
},
diff --git a/packages/kogito-data-index-postgresql-image/install.js
b/packages/kogito-data-index-postgresql-image/install.js
index 93b2af43560..f18bd9517d8 100644
--- a/packages/kogito-data-index-postgresql-image/install.js
+++ b/packages/kogito-data-index-postgresql-image/install.js
@@ -34,5 +34,6 @@ runKogitoImageInstall({
const { setupMavenConfigFile, buildTailFromPackageJsonDependencies } =
require("@kie-tools/maven-base");
setupMavenConfigFile(`
+ -Drevision=${env.kogitoDataIndexPostgresqlImage.version}
-Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()}
`);
diff --git
a/packages/kogito-data-index-postgresql-image/test-resources/tests/features/kogito-common-postresql-services.feature
b/packages/kogito-data-index-postgresql-image/test-resources/tests/features/kogito-common-postresql-services.feature
index ead2f4b6752..2b07f32f65d 100644
---
a/packages/kogito-data-index-postgresql-image/test-resources/tests/features/kogito-common-postresql-services.feature
+++
b/packages/kogito-data-index-postgresql-image/test-resources/tests/features/kogito-common-postresql-services.feature
@@ -22,10 +22,11 @@ Feature: Kogito-data-index postgresql feature.
Scenario: verify if of container is correctly started with postgresql
parameters
When container is started with env
- | variable | value
|
- | SCRIPT_DEBUG | false
|
- | QUARKUS_DATASOURCE_JDBC_URL |
jdbc:postgresql://localhost:5432/quarkus |
- | QUARKUS_DATASOURCE_USERNAME | kogito
|
- | QUARKUS_DATASOURCE_PASSWORD | s3cr3t
|
+ | variable | value
|
+ | SCRIPT_DEBUG | false
|
+ | QUARKUS_DATASOURCE_JDBC_URL |
jdbc:postgresql://localhost:5432/quarkus |
+ | QUARKUS_DATASOURCE_REACTIVE_URL | postgresql://localhost:5432/quarkus
|
+ | QUARKUS_DATASOURCE_USERNAME | kogito
|
+ | QUARKUS_DATASOURCE_PASSWORD | s3cr3t
|
Then container log should contain -Dquarkus.http.host=0.0.0.0
-Dquarkus.http.port=8080 -jar "/home/kogito/bin/quarkus-app/quarkus-run.jar"
And container log should contain Datasource '<default>': Connection to
localhost:5432 refused
\ No newline at end of file
diff --git a/packages/kogito-jit-runner-image/env/index.js
b/packages/kogito-jit-runner-image/env/index.js
index c5429d19a4d..2c36e17655e 100644
--- a/packages/kogito-jit-runner-image/env/index.js
+++ b/packages/kogito-jit-runner-image/env/index.js
@@ -48,6 +48,7 @@ module.exports = composeEnv([rootEnv,
sonataflowImageCommonEnv], {
account: getOrDefault(this.vars.KOGITO_JIT_RUNNER_IMAGE__account),
name: getOrDefault(this.vars.KOGITO_JIT_RUNNER_IMAGE__name),
buildTag: getOrDefault(this.vars.KOGITO_JIT_RUNNER_IMAGE__buildTag),
+ version: require("../package.json").version,
},
};
},
diff --git a/packages/kogito-jit-runner-image/install.js
b/packages/kogito-jit-runner-image/install.js
index d04ac4ab780..1034874dfb9 100644
--- a/packages/kogito-jit-runner-image/install.js
+++ b/packages/kogito-jit-runner-image/install.js
@@ -35,5 +35,6 @@ runKogitoImageInstall({
const { setupMavenConfigFile, buildTailFromPackageJsonDependencies } =
require("@kie-tools/maven-base");
setupMavenConfigFile(`
+ -Drevision=${env.kogitoJitRunnerImage.version}
-Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()}
`);
diff --git a/packages/kogito-jobs-service-ephemeral-image/env/index.js
b/packages/kogito-jobs-service-ephemeral-image/env/index.js
index bd8561dea8f..ed4fe06ec10 100644
--- a/packages/kogito-jobs-service-ephemeral-image/env/index.js
+++ b/packages/kogito-jobs-service-ephemeral-image/env/index.js
@@ -48,6 +48,7 @@ module.exports = composeEnv([rootEnv,
sonataflowImageCommonEnv], {
account:
getOrDefault(this.vars.KOGITO_JOBS_SERVICE_EPHEMERAL_IMAGE__account),
name:
getOrDefault(this.vars.KOGITO_JOBS_SERVICE_EPHEMERAL_IMAGE__name),
buildTag:
getOrDefault(this.vars.KOGITO_JOBS_SERVICE_EPHEMERAL_IMAGE__buildTag),
+ version: require("../package.json").version,
},
};
},
diff --git a/packages/kogito-jobs-service-ephemeral-image/install.js
b/packages/kogito-jobs-service-ephemeral-image/install.js
index 869210319b1..b7f5d938d1b 100644
--- a/packages/kogito-jobs-service-ephemeral-image/install.js
+++ b/packages/kogito-jobs-service-ephemeral-image/install.js
@@ -34,5 +34,6 @@ runKogitoImageInstall({
const { setupMavenConfigFile, buildTailFromPackageJsonDependencies } =
require("@kie-tools/maven-base");
setupMavenConfigFile(`
+ -Drevision=${env.kogitoJobsServiceEphemeralImage.version}
-Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()}
`);
diff --git a/packages/kogito-jobs-service-postgresql-image/env/index.js
b/packages/kogito-jobs-service-postgresql-image/env/index.js
index f4f843b1e06..eb4c5ff1d4d 100644
--- a/packages/kogito-jobs-service-postgresql-image/env/index.js
+++ b/packages/kogito-jobs-service-postgresql-image/env/index.js
@@ -48,6 +48,7 @@ module.exports = composeEnv([rootEnv,
sonataflowImageCommonEnv], {
account:
getOrDefault(this.vars.KOGITO_JOBS_SERVICE_POSTGRESQL_IMAGE__account),
name:
getOrDefault(this.vars.KOGITO_JOBS_SERVICE_POSTGRESQL_IMAGE__name),
buildTag:
getOrDefault(this.vars.KOGITO_JOBS_SERVICE_POSTGRESQL_IMAGE__buildTag),
+ version: require("../package.json").version,
},
};
},
diff --git a/packages/kogito-jobs-service-postgresql-image/install.js
b/packages/kogito-jobs-service-postgresql-image/install.js
index fe49100f9ef..ffcd0ac1b16 100644
--- a/packages/kogito-jobs-service-postgresql-image/install.js
+++ b/packages/kogito-jobs-service-postgresql-image/install.js
@@ -34,5 +34,6 @@ runKogitoImageInstall({
const { setupMavenConfigFile, buildTailFromPackageJsonDependencies } =
require("@kie-tools/maven-base");
setupMavenConfigFile(`
+ -Drevision=${env.kogitoJobsServicePostgresqlImage.version}
-Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()}
`);
diff --git
a/packages/kogito-jobs-service-postgresql-image/test-resources/tests/features/kogito-jobs-service-postgresql.feature
b/packages/kogito-jobs-service-postgresql-image/test-resources/tests/features/kogito-jobs-service-postgresql.feature
index 7e8c9d6e730..cdfd78b507d 100644
---
a/packages/kogito-jobs-service-postgresql-image/test-resources/tests/features/kogito-jobs-service-postgresql.feature
+++
b/packages/kogito-jobs-service-postgresql-image/test-resources/tests/features/kogito-jobs-service-postgresql.feature
@@ -34,12 +34,13 @@ Feature: Kogito-jobs-service-postgresql feature.
Scenario: verify if container starts as expected
When container is started with env
- | variable | value
|
- | SCRIPT_DEBUG | false
|
- | QUARKUS_LOG_LEVEL | DEBUG
|
- | QUARKUS_DATASOURCE_DB_KIND | postgresql
|
- | QUARKUS_DATASOURCE_USERNAME | test
|
- | QUARKUS_DATASOURCE_PASSWORD | 123456
|
- | QUARKUS_DATASOURCE_JDBC_URL |
jdbc:postgresql://10.11.12.13:5432/hibernate_orm_test |
+ | variable | value
|
+ | SCRIPT_DEBUG | false
|
+ | QUARKUS_LOG_LEVEL | DEBUG
|
+ | QUARKUS_DATASOURCE_DB_KIND | postgresql
|
+ | QUARKUS_DATASOURCE_USERNAME | test
|
+ | QUARKUS_DATASOURCE_PASSWORD | 123456
|
+ | QUARKUS_DATASOURCE_JDBC_URL |
jdbc:postgresql://10.11.12.13:5432/hibernate_orm_test |
+ | QUARKUS_DATASOURCE_REACTIVE_URL |
postgresql://10.11.12.13:5432/hibernate_orm_test |
Then container log should contain -Dquarkus.http.host=0.0.0.0
-Dquarkus.http.port=8080 -jar "/home/kogito/bin/quarkus-app/quarkus-run.jar"
And container log should contain connected to
jdbc:postgresql://10.11.12.13:5432/hibernate_orm_test
diff --git a/packages/maven-base/pom.xml b/packages/maven-base/pom.xml
index 98c66995828..e5bf2887d21 100644
--- a/packages/maven-base/pom.xml
+++ b/packages/maven-base/pom.xml
@@ -123,22 +123,22 @@
<version.maven.surefire.plugin>3.5.0</version.maven.surefire.plugin>
<!-- Apache KIE -->
- <version.org.kie.kogito>999-20250511-local</version.org.kie.kogito>
+ <version.org.kie.kogito>999-20250622-local</version.org.kie.kogito>
<!-- Quarkus -->
- <version.quarkus>3.15.3.1</version.quarkus>
+ <version.quarkus>3.20.1</version.quarkus>
<!-- 3rd party dependencies -->
<version.junit>4.13.2</version.junit>
-
<version.org.apache.commons.commons-compress>1.26.1</version.org.apache.commons.commons-compress>
+
<version.org.apache.commons.commons-compress>1.27.1</version.org.apache.commons.commons-compress>
<version.org.iq80.snappy>0.5</version.org.iq80.snappy>
<version.org.apache.mime4j>0.8.11</version.org.apache.mime4j>
<version.org.freemarker>2.3.32</version.org.freemarker>
- <version.org.assertj>3.25.3</version.org.assertj>
- <version.org.junit.jupiter>5.10.2</version.org.junit.jupiter>
+ <version.org.assertj>3.27.3</version.org.assertj>
+ <version.org.junit.jupiter>5.12.2</version.org.junit.jupiter>
<version.org.mockito>4.11.0</version.org.mockito>
<version.org.kie.j2cl.tools.yaml.mapper>0.4</version.org.kie.j2cl.tools.yaml.mapper>
- <version.io.netty>4.1.118.Final</version.io.netty>
+ <version.io.netty>4.1.121.Final</version.io.netty>
</properties>
<dependencyManagement>
diff --git a/packages/root-env/env/index.js b/packages/root-env/env/index.js
index 88b2189dd49..53d2f51dace 100644
--- a/packages/root-env/env/index.js
+++ b/packages/root-env/env/index.js
@@ -69,12 +69,12 @@ module.exports = composeEnv([], {
},
/* (end) */
QUARKUS_PLATFORM_version: {
- default: "3.15.3.1",
+ default: "3.20.1",
description: "Quarkus version to be used on dependency declaration.",
},
/* (begin) This part of the file is referenced in
`scripts/update-kogito-version` */
KOGITO_RUNTIME_version: {
- default: "999-20250511-local",
+ default: "999-20250622-local",
description: "Kogito version to be used on dependency declaration.",
},
/* (end) */
diff --git a/packages/runtime-tools-management-console-webapp/README.md
b/packages/runtime-tools-management-console-webapp/README.md
index df7005778c6..2c09e4ecb5d 100644
--- a/packages/runtime-tools-management-console-webapp/README.md
+++ b/packages/runtime-tools-management-console-webapp/README.md
@@ -42,7 +42,7 @@ Add the `quarkus-oidc-proxy` extension to your `pom.xml` to
proxy the Identity P
<dependency>
<groupId>io.quarkiverse.oidc-proxy</groupId>
<artifactId>quarkus-oidc-proxy</artifactId>
- <version>0.1.2</version>
+ <version>0.2.2</version>
</dependency>
```
diff --git
a/packages/runtime-tools-management-console-webapp/dev-webapp/secured-runtime/pom.xml
b/packages/runtime-tools-management-console-webapp/dev-webapp/secured-runtime/pom.xml
index 7b58bf640be..9f067e2b0f5 100644
---
a/packages/runtime-tools-management-console-webapp/dev-webapp/secured-runtime/pom.xml
+++
b/packages/runtime-tools-management-console-webapp/dev-webapp/secured-runtime/pom.xml
@@ -119,7 +119,7 @@
<dependency>
<groupId>io.quarkiverse.oidc-proxy</groupId>
<artifactId>quarkus-oidc-proxy</artifactId>
- <version>0.1.2</version>
+ <version>0.2.2</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git
a/packages/runtime-tools-management-console-webapp/dev-webapp/unsecured-runtime/pom.xml
b/packages/runtime-tools-management-console-webapp/dev-webapp/unsecured-runtime/pom.xml
index 8ba0285dba8..d043a4aef09 100644
---
a/packages/runtime-tools-management-console-webapp/dev-webapp/unsecured-runtime/pom.xml
+++
b/packages/runtime-tools-management-console-webapp/dev-webapp/unsecured-runtime/pom.xml
@@ -136,7 +136,7 @@
<!-- Messaging -->
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-smallrye-reactive-messaging-kafka</artifactId>
+ <artifactId>quarkus-messaging-kafka</artifactId>
</dependency>
<dependency>
<groupId>org.kie</groupId>
diff --git
a/packages/sonataflow-operator/internal/controller/platform/db_migrator_job.go
b/packages/sonataflow-operator/internal/controller/platform/db_migrator_job.go
index 9213adbb4e1..cafa4af6c89 100644
---
a/packages/sonataflow-operator/internal/controller/platform/db_migrator_job.go
+++
b/packages/sonataflow-operator/internal/controller/platform/db_migrator_job.go
@@ -24,6 +24,7 @@ import (
"errors"
"fmt"
"strconv"
+ "strings"
"github.com/apache/incubator-kie-tools/packages/sonataflow-operator/api/version"
@@ -51,6 +52,10 @@ type QuarkusDataSource struct {
Schema string
}
+func (q *QuarkusDataSource) JdbcReactiveUrl() string {
+ return strings.TrimPrefix(q.JdbcUrl, "jdbc:")
+}
+
type DBMigratorJob struct {
MigrateDBDataIndex bool
DataIndexDataSource *QuarkusDataSource
@@ -69,17 +74,19 @@ const (
dbMigrationJobFailed = 1
dbMigrationJobSucceeded = 1
- migrateDBDataIndex = "MIGRATE_DB_DATAINDEX"
- quarkusDataSourceDataIndexJdbcURL =
"QUARKUS_DATASOURCE_DATAINDEX_JDBC_URL"
- quarkusDataSourceDataIndexUserName =
"QUARKUS_DATASOURCE_DATAINDEX_USERNAME"
- quarkusDataSourceDataIndexPassword =
"QUARKUS_DATASOURCE_DATAINDEX_PASSWORD"
- quarkusFlywayDataIndexSchemas = "QUARKUS_FLYWAY_DATAINDEX_SCHEMAS"
-
- migrateDBJobsService = "MIGRATE_DB_JOBSSERVICE"
- quarkusDataSourceJobsServiceJdbcURL =
"QUARKUS_DATASOURCE_JOBSSERVICE_JDBC_URL"
- quarkusDataSourceJobsServiceUserName =
"QUARKUS_DATASOURCE_JOBSSERVICE_USERNAME"
- quarkusDataSourceJobsServicePassword =
"QUARKUS_DATASOURCE_JOBSSERVICE_PASSWORD"
- quarkusFlywayJobsServiceSchemas =
"QUARKUS_FLYWAY_JOBSSERVICE_SCHEMAS"
+ migrateDBDataIndex = "MIGRATE_DB_DATAINDEX"
+ quarkusDataSourceDataIndexJdbcURL =
"QUARKUS_DATASOURCE_DATAINDEX_JDBC_URL"
+ quarkusDataSourceDataIndexJdbcReactiveURL =
"QUARKUS_DATASOURCE_DATAINDEX_REACTIVE_URL"
+ quarkusDataSourceDataIndexUserName =
"QUARKUS_DATASOURCE_DATAINDEX_USERNAME"
+ quarkusDataSourceDataIndexPassword =
"QUARKUS_DATASOURCE_DATAINDEX_PASSWORD"
+ quarkusFlywayDataIndexSchemas =
"QUARKUS_FLYWAY_DATAINDEX_SCHEMAS"
+
+ migrateDBJobsService = "MIGRATE_DB_JOBSSERVICE"
+ quarkusDataSourceJobsServiceJdbcURL =
"QUARKUS_DATASOURCE_JOBSSERVICE_JDBC_URL"
+ quarkusDataSourceJobsServiceJdbcReactiveURL =
"QUARKUS_DATASOURCE_JOBSSERVICE_REACTIVE_URL"
+ quarkusDataSourceJobsServiceUserName =
"QUARKUS_DATASOURCE_JOBSSERVICE_USERNAME"
+ quarkusDataSourceJobsServicePassword =
"QUARKUS_DATASOURCE_JOBSSERVICE_PASSWORD"
+ quarkusFlywayJobsServiceSchemas =
"QUARKUS_FLYWAY_JOBSSERVICE_SCHEMAS"
)
type DBMigrationJobCfg struct {
@@ -302,6 +309,10 @@ func createJobDBMigration(platform
*operatorapi.SonataFlowPlatform, dbmj *DBMigr
Name:
quarkusDataSourceDataIndexJdbcURL,
Value:
diQuarkusDataSource.JdbcUrl,
},
+ {
+ Name:
quarkusDataSourceDataIndexJdbcReactiveURL,
+ Value:
diQuarkusDataSource.JdbcReactiveUrl(),
+ },
{
Name:
quarkusDataSourceDataIndexUserName,
ValueFrom: &corev1.EnvVarSource{
@@ -332,6 +343,10 @@ func createJobDBMigration(platform
*operatorapi.SonataFlowPlatform, dbmj *DBMigr
Name:
quarkusDataSourceJobsServiceJdbcURL,
Value:
jsQuarkusDataSource.JdbcUrl,
},
+ {
+ Name:
quarkusDataSourceJobsServiceJdbcReactiveURL,
+ Value:
jsQuarkusDataSource.JdbcReactiveUrl(),
+ },
{
Name:
quarkusDataSourceJobsServiceUserName,
ValueFrom: &corev1.EnvVarSource{
diff --git
a/packages/sonataflow-operator/internal/controller/profiles/common/object_creators_test.go
b/packages/sonataflow-operator/internal/controller/profiles/common/object_creators_test.go
index 70a50b55d8d..02784798f77 100644
---
a/packages/sonataflow-operator/internal/controller/profiles/common/object_creators_test.go
+++
b/packages/sonataflow-operator/internal/controller/profiles/common/object_creators_test.go
@@ -471,6 +471,10 @@ func TestMergePodSpec_WithPostgreSQL_and_JDBC_URL_field(t
*testing.T) {
Name: "QUARKUS_DATASOURCE_JDBC_URL",
Value:
"jdbc:postgresql://host:port/database?currentSchema=workflow",
},
+ {
+ Name: "QUARKUS_DATASOURCE_REACTIVE_URL",
+ Value:
"postgresql://host:port/database?currentSchema=workflow",
+ },
{
Name: "KOGITO_PERSISTENCE_TYPE",
Value: "jdbc",
@@ -555,6 +559,10 @@ func
TestMergePodSpec_OverrideContainers_WithPostgreSQL_In_Workflow_CR(t *testin
Name: "QUARKUS_DATASOURCE_JDBC_URL",
Value:
"jdbc:postgresql://test.foo:5432/petstore?currentSchema=bar",
},
+ {
+ Name: "QUARKUS_DATASOURCE_REACTIVE_URL",
+ Value:
"postgresql://test.foo:5432/petstore?currentSchema=bar",
+ },
{
Name: "KOGITO_PERSISTENCE_TYPE",
Value: "jdbc",
@@ -627,6 +635,10 @@ func
TestMergePodSpec_WithServicedPostgreSQL_In_Platform_CR_And_Worflow_Requesti
Name: "QUARKUS_DATASOURCE_JDBC_URL",
Value:
"jdbc:postgresql://service_name.service_namespace:5432/foo?currentSchema=greeting",
},
+ {
+ Name: "QUARKUS_DATASOURCE_REACTIVE_URL",
+ Value:
"postgresql://service_name.service_namespace:5432/foo?currentSchema=greeting",
+ },
{
Name: "KOGITO_PERSISTENCE_TYPE",
Value: "jdbc",
@@ -727,6 +739,10 @@ func
TestMergePodSpec_WithServicedPostgreSQL_In_Platform_And_In_Workflow_CR(t *t
Name: "QUARKUS_DATASOURCE_JDBC_URL",
Value:
"jdbc:postgresql://test.default:5432/my_database?currentSchema=bar",
},
+ {
+ Name: "QUARKUS_DATASOURCE_REACTIVE_URL",
+ Value:
"postgresql://test.default:5432/my_database?currentSchema=bar",
+ },
{
Name: "KOGITO_PERSISTENCE_TYPE",
Value: "jdbc",
@@ -944,6 +960,10 @@ func doTestDefaultContainer_WithPlatformPersistence(t
*testing.T, workflow *v1al
Name: "QUARKUS_DATASOURCE_JDBC_URL",
Value:
"jdbc:postgresql://service_name.service_namespace:5432/foo?currentSchema=greeting",
},
+ {
+ Name: "QUARKUS_DATASOURCE_REACTIVE_URL",
+ Value:
"postgresql://service_name.service_namespace:5432/foo?currentSchema=greeting",
+ },
{
Name: "KOGITO_PERSISTENCE_TYPE",
Value: "jdbc",
diff --git
a/packages/sonataflow-operator/internal/controller/profiles/common/persistence/postgresql.go
b/packages/sonataflow-operator/internal/controller/profiles/common/persistence/postgresql.go
index a90a774c9b9..fad8db6d7d5 100644
---
a/packages/sonataflow-operator/internal/controller/profiles/common/persistence/postgresql.go
+++
b/packages/sonataflow-operator/internal/controller/profiles/common/persistence/postgresql.go
@@ -57,6 +57,9 @@ func ConfigurePostgreSQLEnv(postgresql
*operatorapi.PersistencePostgreSQL, datab
}
dataSourceURL =
fmt.Sprintf("jdbc:postgresql://%s.%s:%d/%s?currentSchema=%s",
postgresql.ServiceRef.Name, databaseNamespace, dataSourcePort, databaseName,
databaseSchema)
}
+
+ dataSourceReactiveURL := strings.TrimPrefix(dataSourceURL, "jdbc:")
+
secretRef := corev1.LocalObjectReference{
Name: postgresql.SecretRef.Name,
}
@@ -95,6 +98,10 @@ func ConfigurePostgreSQLEnv(postgresql
*operatorapi.PersistencePostgreSQL, datab
Name: "QUARKUS_DATASOURCE_JDBC_URL",
Value: dataSourceURL,
},
+ {
+ Name: "QUARKUS_DATASOURCE_REACTIVE_URL",
+ Value: dataSourceReactiveURL,
+ },
{
Name: "KOGITO_PERSISTENCE_TYPE",
Value: "jdbc",
diff --git
a/packages/sonataflow-operator/internal/controller/sonataflowplatform_controller_test.go
b/packages/sonataflow-operator/internal/controller/sonataflowplatform_controller_test.go
index 407b84beb7d..370d3e8a50a 100644
---
a/packages/sonataflow-operator/internal/controller/sonataflowplatform_controller_test.go
+++
b/packages/sonataflow-operator/internal/controller/sonataflowplatform_controller_test.go
@@ -327,10 +327,18 @@ func TestSonataFlowPlatformController(t *testing.T) {
Name: "QUARKUS_DATASOURCE_JDBC_URL",
Value:
"jdbc:postgresql://postgresql.default:5432/sonataflow?currentSchema=sonataflow-platform-data-index-service",
}
+ dbSourceDIReactiveURL := corev1.EnvVar{
+ Name: "QUARKUS_DATASOURCE_REACTIVE_URL",
+ Value:
"postgresql://postgresql.default:5432/sonataflow?currentSchema=sonataflow-platform-data-index-service",
+ }
dbSourceJSURL := corev1.EnvVar{
Name: "QUARKUS_DATASOURCE_JDBC_URL",
Value:
"jdbc:postgresql://postgresql.default:5432/sonataflow?currentSchema=sonataflow-platform-jobs-service",
}
+ dbSourceJSReactiveURL := corev1.EnvVar{
+ Name: "QUARKUS_DATASOURCE_REACTIVE_URL",
+ Value:
"postgresql://postgresql.default:5432/sonataflow?currentSchema=sonataflow-platform-jobs-service",
+ }
dbUsername := corev1.EnvVar{
Name: "QUARKUS_DATASOURCE_USERNAME",
Value: "",
@@ -361,6 +369,7 @@ func TestSonataFlowPlatformController(t *testing.T) {
assert.Contains(t, dep.Spec.Template.Spec.Containers[0].Env,
dbUsername)
assert.Contains(t, dep.Spec.Template.Spec.Containers[0].Env,
dbPassword)
assert.Contains(t, dep.Spec.Template.Spec.Containers[0].Env,
dbSourceDIURL)
+ assert.Contains(t, dep.Spec.Template.Spec.Containers[0].Env,
dbSourceDIReactiveURL)
js := services.NewJobServiceHandler(ksp)
assert.NoError(t, cl.Get(context.TODO(),
types.NamespacedName{Name: js.GetServiceName(), Namespace: ksp.Namespace}, dep))
@@ -370,6 +379,7 @@ func TestSonataFlowPlatformController(t *testing.T) {
assert.Contains(t, dep.Spec.Template.Spec.Containers[0].Env,
dbUsername)
assert.Contains(t, dep.Spec.Template.Spec.Containers[0].Env,
dbPassword)
assert.Contains(t, dep.Spec.Template.Spec.Containers[0].Env,
dbSourceJSURL)
+ assert.Contains(t, dep.Spec.Template.Spec.Containers[0].Env,
dbSourceJSReactiveURL)
})
t.Run("verify that persistence options are correctly reconciled when
defined in the platform and overwriten in the services spec", func(t
*testing.T) {
diff --git
a/packages/sonataflow-quarkus-devui/sonataflow-quarkus-devui-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/DevConsoleProcessor.java
b/packages/sonataflow-quarkus-devui/sonataflow-quarkus-devui-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/DevConsoleProcessor.java
index 70a7da646a6..9cd6fe89b0b 100644
---
a/packages/sonataflow-quarkus-devui/sonataflow-quarkus-devui-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/DevConsoleProcessor.java
+++
b/packages/sonataflow-quarkus-devui/sonataflow-quarkus-devui-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/DevConsoleProcessor.java
@@ -26,6 +26,7 @@ import java.util.List;
import io.quarkus.deployment.Capabilities;
import io.quarkus.devui.spi.JsonRPCProvidersBuildItem;
import org.eclipse.microprofile.config.ConfigProvider;
+import org.eclipse.microprofile.config.ConfigValue;
import
org.kie.sonataflow.swf.tools.runtime.config.DevUIStaticArtifactsRecorder;
import io.quarkus.deployment.IsDevelopment;
@@ -144,29 +145,29 @@ public class DevConsoleProcessor {
List<SystemPropertyBuildItem> systemPropertyBuildItems,
String propertyKey) {
- String propertyValue = configurationBuildItem
+ ConfigValue propertyConfig = configurationBuildItem
.getReadResult()
.getAllBuildTimeValues()
.get(propertyKey);
- if (propertyValue == null) {
- propertyValue = configurationBuildItem
+ if (propertyConfig == null) {
+ propertyConfig = configurationBuildItem
.getReadResult()
.getBuildTimeRunTimeValues()
.get(propertyKey);
} else {
- return propertyValue;
+ return propertyConfig.getValue();
}
- if (propertyValue == null) {
- propertyValue = configurationBuildItem
+ if (propertyConfig == null) {
+ propertyConfig = configurationBuildItem
.getReadResult()
.getRunTimeDefaultValues()
.get(propertyKey);
}
- if (propertyValue != null) {
- return propertyValue;
+ if (propertyConfig != null) {
+ return propertyConfig.getValue();
}
return systemPropertyBuildItems.stream().filter(property ->
property.getKey().equals(propertyKey))
diff --git a/repo/KOGITO_UPGRADE_PROCESS.md b/repo/KOGITO_UPGRADE_PROCESS.md
index 78a6c2a9eb9..0d9a9f6811b 100644
--- a/repo/KOGITO_UPGRADE_PROCESS.md
+++ b/repo/KOGITO_UPGRADE_PROCESS.md
@@ -31,7 +31,7 @@ With the [GitHub CLI](https://cli.github.com/) installed, you
can run:
```bash
-DATE='2025-05-11' # CHANGE THIS TO WHATEVER DATE YOU'D LIKE TO UPGRADE TO.
+DATE='2025-06-22' # CHANGE THIS TO WHATEVER DATE YOU'D LIKE TO UPGRADE TO.
PAGER='cat'
DROOLS_SHA=$(gh search commits --author-date "<${DATE}" -R
"apache/incubator-kie-drools" --sort author-date --order desc --json sha
--limit 1 --jq '.[].sha')
OPTAPLANNER_SHA=$(gh search commits --author-date "<${DATE}" -R
"apache/incubator-kie-optaplanner" --sort author-date --order desc --json sha
--limit 1 --jq '.[].sha')
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
