Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/supporting-files/ci/osl/.env
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ SONATAFLOW_QUARKUS_DEVUI_VERSION=${JAVA_RUNTIME_VERSION}

# General versioning variables for Quarkus - keep the community versions here
# These are updated by internal build-config to product value
QUARKUS_PLATFORM_version=3.27.4.1
QUARKUS_VERSION=3.27.4.1
QUARKUS_PLATFORM_version=3.33.3
QUARKUS_VERSION=3.33.3

# Variables to control packages/sonataflow-operator build
SONATAFLOW_OPERATOR__buildTag=${KIE_TOOLS_BUILD__streamName}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci_build_operator_full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ env:
KOGITO_RUNTIME_version: "111-SNAPSHOT"
SONATAFLOW_QUARKUS_DEVUI_VERSION: "111-SNAPSHOT"
SONATAFLOW_DEVMODE_IMAGE__sonataflowQuarkusDevUiVersion: "111-SNAPSHOT"
QUARKUS_PLATFORM_version: "3.27.4.1"
QUARKUS_VERSION: "3.27.4.1"
QUARKUS_PLATFORM_version: "3.33.3"
QUARKUS_VERSION: "3.23.3"

permissions:
packages: read
Expand Down
2 changes: 1 addition & 1 deletion examples/sonataflow-greeting/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<artifactId>quarkus-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion packages/jbpm-quarkus-devui/dev/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@

<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<artifactId>quarkus-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:default;NON_KEYWORDS=VALUE,KEY;DB_CLOSE_
# Security
kogito.security.auth.enabled=false
quarkus.oidc.enabled=false
quarkus.http.cors=true
quarkus.http.cors.enabled=true
quarkus.http.cors.origins=/.*/

# Misc.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5-internal</artifactId>
<artifactId>quarkus-junit-internal</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@

<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<artifactId>quarkus-junit</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5-mockito</artifactId>
<artifactId>quarkus-junit-mockito</artifactId>
<scope>test</scope>
</dependency>

Expand Down
2 changes: 2 additions & 0 deletions packages/jbpm-quarkus-devui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>@{argLine}</argLine>
<systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
</systemPropertyVariables>
Expand All @@ -67,6 +68,7 @@
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<argLine>@{argLine}</argLine>
<systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
</systemPropertyVariables>
Expand Down
5 changes: 2 additions & 3 deletions packages/kie-sandbox-fs/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@
*/

// Karma configuration
process.env.CHROME_BIN = require("puppeteer").executablePath();

const REPO = process.env.BUILD_REPOSITORY_NAME;
const ISSUE = process.env.SYSTEM_PULLREQUEST_PULLREQUESTNUMBER || process.env.SYSTEM_PULLREQUEST_PULLREQUESTID;
const COMMIT = process.env.BUILD_SOURCEVERSION;

module.exports = function (config) {
module.exports = async function (config) {
process.env.CHROME_BIN = await require("puppeteer").executablePath();
const options = {
// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<artifactId>quarkus-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<artifactId>quarkus-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ Feature: Kogito-data-index postgresql feature.
| 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
And container log should contain Connection to localhost:5432 refused
2 changes: 1 addition & 1 deletion packages/kogito-db-migrator-tool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<artifactId>quarkus-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 4 additions & 2 deletions packages/maven-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@
<!-- Config -->
<project.build.outputTimestamp>2024-01-12T00:00:00Z</project.build.outputTimestamp>
<maven.compiler.parameters>true</maven.compiler.parameters>
<!-- Empty default so @{argLine} in surefire/failsafe resolves when jacoco is not active -->
<argLine />

<!-- Plugins version -->
<version.codehaus.flatten.plugin>1.6.0</version.codehaus.flatten.plugin>
Expand All @@ -137,7 +139,7 @@
<version.org.kie.kogito>111-SNAPSHOT</version.org.kie.kogito>

<!-- Quarkus -->
<version.quarkus>3.27.4.1</version.quarkus>
<version.quarkus>3.33.3</version.quarkus>

<!-- 3rd party dependencies -->
<version.junit>4.13.2</version.junit>
Expand All @@ -146,7 +148,7 @@
<version.org.apache.mime4j>0.8.12</version.org.apache.mime4j>
<version.org.freemarker>2.3.34</version.org.freemarker>
<version.org.assertj>3.27.7</version.org.assertj>
<version.org.junit.jupiter>5.13.4</version.org.junit.jupiter>
<version.org.junit.jupiter>6.0.3</version.org.junit.jupiter>
<version.org.mockito>5.18.0</version.org.mockito>
<version.org.kie.j2cl.tools.yaml.mapper>0.8</version.org.kie.j2cl.tools.yaml.mapper>
<version.io.netty>4.1.136.Final</version.io.netty>
Expand Down
2 changes: 1 addition & 1 deletion packages/root-env/env/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ module.exports = composeEnv([], {
},
/* (end) */
QUARKUS_PLATFORM_version: {
default: "3.27.4.1",
default: "3.33.3",
description: "Quarkus version to be used on dependency declaration.",
},
/* (begin) This part of the file is referenced in `scripts/update-kogito-version` */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

# quarkus.http.port= --> This is set on package.json. See 'start:runtime' script.
quarkus.http.host=0.0.0.0
quarkus.http.cors=true
quarkus.http.cors.enabled=true
quarkus.http.cors.origins=*
quarkus.http.root-path=/my-subpath

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ kogito.security.auth.enabled=false

quarkus.oidc.enabled=false

quarkus.http.cors=true
quarkus.http.cors.enabled=true
quarkus.http.cors.origins=*

# Misc.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
<name>KIE Tools :: Serverless Logic Web Tools :: Deployment Quarkus app</name>

<properties>
<!-- Empty default so @{argLine} in surefire resolves when jacoco is not active -->
<argLine />
<compiler-plugin.version>3.13.0</compiler-plugin.version>
<failsafe.useModulePath>false</failsafe.useModulePath>
<maven.compiler.release>17</maven.compiler.release>
Expand All @@ -49,7 +51,7 @@
<com.github.erosb.everit-json-schema.version>1.14.2</com.github.erosb.everit-json-schema.version>
<surefire-plugin.version>3.5.0</surefire-plugin.version>
<version.org.kie.kogito>${project.version}</version.org.kie.kogito>
<version.quarkus>3.27.4.1</version.quarkus>
<version.quarkus>3.33.3</version.quarkus>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -137,7 +139,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<artifactId>quarkus-junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -200,6 +202,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-plugin.version}</version>
<configuration>
<argLine>@{argLine}</argLine>
<systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
<maven.home>${maven.home}</maven.home>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#

quarkus.swagger-ui.always-include=true
quarkus.http.cors=true
quarkus.http.cors.enabled=true
quarkus.http.cors.origins=*
quarkus.dev-ui.cors.enabled=false
quarkus.http.host=0.0.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@
<artifactId>greeting-flow</artifactId>
<version>111-SNAPSHOT</version>
<properties>
<!-- Empty default so @{argLine} in surefire resolves when jacoco is not active -->
<argLine />
<compiler-plugin.version>3.13.0</compiler-plugin.version>
<maven.compiler.release>17</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<version.quarkus>3.27.4.1</version.quarkus>
<version.quarkus>3.33.3</version.quarkus>
<skipITs>true</skipITs>
<surefire-plugin.version>3.5.0</surefire-plugin.version>
</properties>
Expand Down Expand Up @@ -74,7 +76,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<artifactId>quarkus-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -113,6 +115,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-plugin.version}</version>
<configuration>
<argLine>@{argLine}</argLine>
<systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
<maven.home>${maven.home}</maven.home>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
//DEPS org.slf4j:slf4j-simple:2.0.9

// Junit console to start the test engine:
//DEPS org.junit.platform:junit-platform-console:1.10.1
//DEPS org.junit.platform:junit-platform-console:6.0.3

// engine to run the tests (tests are written with Junit5):
//DEPS org.junit.jupiter:junit-jupiter-engine:5.10.1
// engine to run the tests (tests are written with Junit6):
//DEPS org.junit.jupiter:junit-jupiter-engine:6.0.3

// testcontainers
//DEPS org.testcontainers:testcontainers:2.0.3
//DEPS org.testcontainers:testcontainers-junit-jupiter:2.0.3
//DEPS org.testcontainers:testcontainers:2.0.4
//DEPS org.testcontainers:testcontainers-junit-jupiter:2.0.4

import static org.junit.jupiter.api.Assertions.assertEquals;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
//DEPS org.slf4j:slf4j-simple:2.0.9

// Junit console to start the test engine:
//DEPS org.junit.platform:junit-platform-console:1.10.1
//DEPS org.junit.platform:junit-platform-console:6.0.3

// engine to run the tests (tests are written with Junit5):
//DEPS org.junit.jupiter:junit-jupiter-engine:5.10.1
// engine to run the tests (tests are written with Junit6):
//DEPS org.junit.jupiter:junit-jupiter-engine:6.0.3

// testcontainers
//DEPS org.testcontainers:testcontainers:1.21.4
//DEPS org.testcontainers:testcontainers-junit-jupiter:1.21.4
//DEPS org.testcontainers:testcontainers:2.0.4
//DEPS org.testcontainers:testcontainers-junit-jupiter:2.0.4

import static org.junit.jupiter.api.Assertions.assertEquals;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
//DEPS org.slf4j:slf4j-simple:2.0.9

// Junit console to start the test engine:
//DEPS org.junit.platform:junit-platform-console:1.10.1
//DEPS org.junit.platform:junit-platform-console:6.0.3

// engine to run the tests (tests are written with Junit5):
//DEPS org.junit.jupiter:junit-jupiter-engine:5.10.1
// engine to run the tests (tests are written with Junit6):
//DEPS org.junit.jupiter:junit-jupiter-engine:6.0.3

// testcontainers
//DEPS org.testcontainers:testcontainers:1.19.3
//DEPS org.testcontainers:junit-jupiter:1.19.3
//DEPS org.testcontainers:testcontainers:2.0.4
//DEPS org.testcontainers:testcontainers-junit-jupiter:2.0.4

import static org.junit.jupiter.api.Assertions.assertEquals;

Expand Down
2 changes: 2 additions & 0 deletions packages/sonataflow-quarkus-devui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>@{argLine}</argLine>
<systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
</systemPropertyVariables>
Expand All @@ -67,6 +68,7 @@
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<argLine>@{argLine}</argLine>
<systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
</systemPropertyVariables>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5-internal</artifactId>
<artifactId>quarkus-junit-internal</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,13 @@

<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<artifactId>quarkus-junit</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5-mockito</artifactId>
<artifactId>quarkus-junit-mockito</artifactId>
<scope>test</scope>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
# under the License.
#

quarkus.http.cors=true
quarkus.http.cors.enabled=true
quarkus.http.cors.origins=*
quarkus.dev-ui.cors.enabled=false
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<version.npm>11.17.0</version.npm>
<version.pnpm>10.34.4</version.pnpm>

<version.quarkus>3.27.4.1</version.quarkus>
<version.quarkus>3.33.3</version.quarkus>
<version.org.kie.kogito>${project.version}</version.org.kie.kogito>
<skip.maven.deploy.in.pnpm.wrapped.artifacts>true</skip.maven.deploy.in.pnpm.wrapped.artifacts>
</properties>
Expand Down
Loading