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 f98665c1e42 kie-tools#2621: Remove build-kogito-app stage from Kogito
images (#2682)
f98665c1e42 is described below
commit f98665c1e42af23bc540a6ad4c4fe3466f96e60c
Author: Ricardo Zanini <[email protected]>
AuthorDate: Fri Oct 18 23:44:26 2024 -0400
kie-tools#2621: Remove build-kogito-app stage from Kogito images (#2682)
---
packages/kogito-base-builder-image/package.json | 2 +-
.../kogito-data-index-ephemeral-image/package.json | 10 +-
.../resources/app/pom.xml | 63 +++++++
...ator-kie-kogito-data-index-ephemeral-image.yaml | 16 +-
.../kogito-data-index-ephemeral/module.yaml | 8 +-
.../package.json | 10 +-
.../resources/app/pom.xml | 63 +++++++
...tor-kie-kogito-data-index-postgresql-image.yaml | 2 +-
.../kogito-data-index-postgresql/module.yaml | 8 +-
packages/kogito-jit-runner-image/package.json | 10 +-
.../kogito-jit-runner-image/resources/app/pom.xml | 63 +++++++
.../incubator-kie-kogito-jit-runner-image.yaml | 2 +-
.../modules/kogito-jit-runner/module.yaml | 8 +-
.../package.json | 10 +-
.../resources/app/ephemeral/pom.xml | 62 +++++++
.../resources/app/pom.xml | 44 +++++
.../resources/app/postgresql/pom.xml | 62 +++++++
...tor-kie-kogito-jobs-service-allinone-image.yaml | 2 +-
.../kogito-jobs-service-all-in-one/module.yaml | 8 +-
.../package.json | 10 +-
.../resources/app/pom.xml | 63 +++++++
...or-kie-kogito-jobs-service-ephemeral-image.yaml | 2 +-
.../added/kogito-app-launch.sh | 2 +-
.../{ => kogito-jobs-service-ephemeral}/configure | 0
.../module.yaml | 8 +-
.../features/kogito-jobs-service-ephemeral.feature | 4 +-
.../package.json | 10 +-
.../resources/app/pom.xml | 63 +++++++
...r-kie-kogito-jobs-service-postgresql-image.yaml | 2 +-
.../added/kogito-app-launch.sh | 2 +-
.../kogito-jobs-service-postgresql/module.yaml | 8 +-
.../kogito-jobs-service-postgresql.feature | 4 +-
.../sonataflow-image-common/resources/Makefile | 6 -
.../{ => common}/tests/bats/maven-settings.bats | 4 +-
.../resources/scripts/README.md | 4 -
.../resources/scripts/common.py | 6 +-
pnpm-lock.yaml | 182 +++++----------------
repo/graph.dot | 6 +
repo/graph.json | 30 ++++
39 files changed, 641 insertions(+), 228 deletions(-)
diff --git a/packages/kogito-base-builder-image/package.json
b/packages/kogito-base-builder-image/package.json
index 1d9b93bc25a..806db506377 100644
--- a/packages/kogito-base-builder-image/package.json
+++ b/packages/kogito-base-builder-image/package.json
@@ -21,7 +21,7 @@
"image:build": "run-script-os",
"image:build:darwin:linux": "pnpm setup:env make -C ./build build",
"image:build:win32": "echo \"Build skipped on Windows\"",
- "image:test": "run-script-if --ignore-errors \"$(build-env
tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then
\"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p
build/target/test/results && cp -R build/target/test/results dist-tests-e2e/\"",
+ "image:test": "run-script-if --ignore-errors \"$(build-env
tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then
\"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p
build/target/test/results\" \"cp -R build/target/test/results
dist-tests-e2e/\"",
"image:test:darwin:linux": "pnpm setup:env make -C ./build test-image",
"image:test:win32": "echo \"Tests skipped on Windows\"",
"install": "node install.js && pnpm format",
diff --git a/packages/kogito-data-index-ephemeral-image/package.json
b/packages/kogito-data-index-ephemeral-image/package.json
index 0dbc35370c5..6cc2887dec4 100644
--- a/packages/kogito-data-index-ephemeral-image/package.json
+++ b/packages/kogito-data-index-ephemeral-image/package.json
@@ -13,7 +13,7 @@
"url": "https://github.com/apache/incubator-kie-tools/issues"
},
"scripts": {
- "build:dev": "run-script-if --bool \"$(build-env containerImages.build)\"
--then \"pnpm copy-assets\" \"pnpm image:build\"",
+ "build:dev": "run-script-if --bool \"$(build-env containerImages.build)\"
--then \"pnpm mvn-build-app\" \"pnpm copy-assets\" \"pnpm image:build\"",
"build:prod": "pnpm build:dev && pnpm image:test",
"copy-assets": "run-script-os",
"copy-assets:linux:darwin": "rimraf build && cp -R
./node_modules/@kie-tools/sonataflow-image-common/resources build && cp -R
resources/* build",
@@ -21,15 +21,19 @@
"copy-test-assets:linux:darwin": "cp -R test-resources/. build",
"format": "prettier --write . --ignore-path=../../.prettierignore
--ignore-path=../../.gitignore",
"image:build": "run-script-os",
- "image:build:darwin:linux": "pnpm setup:env make -C ./build
build-kogito-app build",
+ "image:build:darwin:linux": "pnpm setup:env make -C ./build build",
"image:build:win32": "echo \"Build skipped on Windows\"",
- "image:test": "run-script-if --ignore-errors \"$(build-env
tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then
\"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p
build/target/test/results && cp -R build/target/test/results dist-tests-e2e/\"",
+ "image:test": "run-script-if --ignore-errors \"$(build-env
tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then
\"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p
build/target/test/results\" \"cp -R build/target/test/results
dist-tests-e2e/\"",
"image:test:darwin:linux": "pnpm copy-test-assets && pnpm setup:env make
-C ./build test-image",
"image:test:win32": "echo \"Tests skipped on Windows\"",
"install": "node install.js && pnpm format",
+ "mvn-build-app": "run-script-os",
+ "mvn-build-app:linux:darwin": "mvn -am package
-Dquarkus.package.type=fast-jar -Dquarkus.container-image.build=false -B -f
./resources/app/pom.xml",
+ "mvn-build-app:win32": "echo \"Build skipped on Windows\"",
"setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate &&
cross-env KOGITO_IMAGE_REGISTRY=$(build-env
kogitoDataIndexEphemeralImage.registry)
KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env
kogitoDataIndexEphemeralImage.account) KOGITO_IMAGE_NAME=$(build-env
kogitoDataIndexEphemeralImage.name) KOGITO_IMAGE_TAG=$(build-env
kogitoDataIndexEphemeralImage.buildTag) QUARKUS_PLATFORM_VERSION=$(build-env
versions.quarkus) KOGITO_VERSION=$(build-env versions.kogito)"
},
"devDependencies": {
+ "@kie-tools/maven-base": "workspace:*",
"@kie-tools/python-venv": "workspace:*",
"@kie-tools/root-env": "workspace:*",
"@kie-tools/sonataflow-image-common": "workspace:*",
diff --git a/packages/kogito-data-index-ephemeral-image/resources/app/pom.xml
b/packages/kogito-data-index-ephemeral-image/resources/app/pom.xml
new file mode 100644
index 00000000000..ae7bd8c8f94
--- /dev/null
+++ b/packages/kogito-data-index-ephemeral-image/resources/app/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+-->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.kie</groupId>
+ <artifactId>kie-tools-maven-base</artifactId>
+ <version>${revision}</version>
+
<relativePath>../../node_modules/@kie-tools/maven-base/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>kogito-data-index-ephemeral-image-app</artifactId>
+ <version>${revision}</version>
+
+ <name>KIE Tools :: Kogito Data Index Ephemeral Image :: App</name>
+ <description>Kogito Data Index Ephemeral Image Quarkus App</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.kie.kogito</groupId>
+ <artifactId>data-index-service-inmemory</artifactId>
+ <version>${version.org.kie.kogito}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git
a/packages/kogito-data-index-ephemeral-image/resources/incubator-kie-kogito-data-index-ephemeral-image.yaml
b/packages/kogito-data-index-ephemeral-image/resources/incubator-kie-kogito-data-index-ephemeral-image.yaml
index 5c414019813..d4be0f424bc 100644
---
a/packages/kogito-data-index-ephemeral-image/resources/incubator-kie-kogito-data-index-ephemeral-image.yaml
+++
b/packages/kogito-data-index-ephemeral-image/resources/incubator-kie-kogito-data-index-ephemeral-image.yaml
@@ -16,25 +16,23 @@
# specific language governing permissions and limitations
# under the License.
#
-schema_version: 1
-
name: "docker.io/apache/incubator-kie-kogito-data-index-ephemeral"
version: "main"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20"
description: "Runtime image for Kogito Data Index Service for ephemeral
PostgreSQL persistence provider"
labels:
- - name: "org.kie.kogito.version"
+ - name: org.kie.kogito.version
value: "### SET ME DURING BUILD PROCESS ###"
- - name: "maintainer"
+ - name: maintainer
value: "Apache KIE <[email protected]>"
- - name: "io.k8s.description"
+ - name: io.k8s.description
value: "Runtime image for Kogito Data Index Service for ephemeral
PostgreSQL persistence provider"
- - name: "io.k8s.display-name"
+ - name: io.k8s.display-name
value: "Kogito Data Index Service - ephemeral PostgreSQL"
- - name: "io.openshift.tags"
+ - name: io.openshift.tags
value: "kogito,data-index,data-index-ephemeral"
- - name: "io.openshift.expose-services"
+ - name: io.openshift.expose-services
value: "8080:http"
envs:
diff --git
a/packages/kogito-data-index-ephemeral-image/resources/modules/kogito-data-index-ephemeral/module.yaml
b/packages/kogito-data-index-ephemeral-image/resources/modules/kogito-data-index-ephemeral/module.yaml
index 94e22660e5b..88fc47af32b 100644
---
a/packages/kogito-data-index-ephemeral-image/resources/modules/kogito-data-index-ephemeral/module.yaml
+++
b/packages/kogito-data-index-ephemeral-image/resources/modules/kogito-data-index-ephemeral/module.yaml
@@ -20,12 +20,10 @@ schema_version: 1
name: org.kie.kogito.dataindex.ephemeral
version: "main"
-# see build-kogito-apps-components.sh script, responsible for build it.
-# called by the Makefile before builds
+# Relative to build/target/image/modules/, that's why the four `../`
artifacts:
- - path: /tmp/build/data-index-service-inmemory
- dest: /home/kogito/bin
- name: quarkus-app
+ - path: ../../../../app/target/quarkus-app
+ dest: /home/kogito/bin/quarkus-app
execute:
- script: configure
diff --git a/packages/kogito-data-index-postgresql-image/package.json
b/packages/kogito-data-index-postgresql-image/package.json
index 39269ed21fb..92fbd5c800e 100644
--- a/packages/kogito-data-index-postgresql-image/package.json
+++ b/packages/kogito-data-index-postgresql-image/package.json
@@ -13,7 +13,7 @@
"url": "https://github.com/apache/incubator-kie-tools/issues"
},
"scripts": {
- "build:dev": "run-script-if --bool \"$(build-env containerImages.build)\"
--then \"pnpm copy-assets\" \"pnpm image:build\"",
+ "build:dev": "run-script-if --bool \"$(build-env containerImages.build)\"
--then \"pnpm mvn-build-app\" \"pnpm copy-assets\" \"pnpm image:build\"",
"build:prod": "pnpm build:dev && pnpm image:test",
"copy-assets": "run-script-os",
"copy-assets:linux:darwin": "rimraf build && cp -R
./node_modules/@kie-tools/sonataflow-image-common/resources build && cp -R
resources/* build",
@@ -21,15 +21,19 @@
"copy-test-assets:linux:darwin": "cp -R test-resources/. build",
"format": "prettier --write . --ignore-path=../../.prettierignore
--ignore-path=../../.gitignore",
"image:build": "run-script-os",
- "image:build:darwin:linux": "pnpm setup:env make -C ./build
build-kogito-app build",
+ "image:build:darwin:linux": "pnpm setup:env make -C ./build build",
"image:build:win32": "echo \"Build skipped on Windows\"",
- "image:test": "run-script-if --ignore-errors \"$(build-env
tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then
\"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p
build/target/test/results && cp -R build/target/test/results dist-tests-e2e/\"",
+ "image:test": "run-script-if --ignore-errors \"$(build-env
tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then
\"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p
build/target/test/results\" \"cp -R build/target/test/results
dist-tests-e2e/\"",
"image:test:darwin:linux": "pnpm copy-test-assets && pnpm setup:env make
-C ./build test-image",
"image:test:win32": "echo \"Tests skipped on Windows\"",
"install": "node install.js && pnpm format",
+ "mvn-build-app": "run-script-os",
+ "mvn-build-app:linux:darwin": "mvn -am package
-Dquarkus.package.type=fast-jar -Dquarkus.container-image.build=false -B -f
./resources/app/pom.xml",
+ "mvn-build-app:win32": "echo \"Build skipped on Windows\"",
"setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate &&
cross-env KOGITO_IMAGE_REGISTRY=$(build-env
kogitoDataIndexPostgresqlImage.registry)
KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env
kogitoDataIndexPostgresqlImage.account) KOGITO_IMAGE_NAME=$(build-env
kogitoDataIndexPostgresqlImage.name) KOGITO_IMAGE_TAG=$(build-env
kogitoDataIndexPostgresqlImage.buildTag) QUARKUS_PLATFORM_VERSION=$(build-env
versions.quarkus) KOGITO_VERSION=$(build-env versions.kogito)"
},
"devDependencies": {
+ "@kie-tools/maven-base": "workspace:*",
"@kie-tools/python-venv": "workspace:*",
"@kie-tools/root-env": "workspace:*",
"@kie-tools/sonataflow-image-common": "workspace:*",
diff --git a/packages/kogito-data-index-postgresql-image/resources/app/pom.xml
b/packages/kogito-data-index-postgresql-image/resources/app/pom.xml
new file mode 100644
index 00000000000..c055b84a81e
--- /dev/null
+++ b/packages/kogito-data-index-postgresql-image/resources/app/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+-->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.kie</groupId>
+ <artifactId>kie-tools-maven-base</artifactId>
+ <version>${revision}</version>
+
<relativePath>../../node_modules/@kie-tools/maven-base/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>kogito-data-index-postgresql-image-app</artifactId>
+ <version>${revision}</version>
+
+ <name>KIE Tools :: Kogito Data Index PostgreSQL Image :: App</name>
+ <description>Kogito Data Index PostgreSQL Image Quarkus App</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.kie.kogito</groupId>
+ <artifactId>data-index-service-postgresql</artifactId>
+ <version>${version.org.kie.kogito}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git
a/packages/kogito-data-index-postgresql-image/resources/incubator-kie-kogito-data-index-postgresql-image.yaml
b/packages/kogito-data-index-postgresql-image/resources/incubator-kie-kogito-data-index-postgresql-image.yaml
index 6baa79e3a5b..ee05a988133 100644
---
a/packages/kogito-data-index-postgresql-image/resources/incubator-kie-kogito-data-index-postgresql-image.yaml
+++
b/packages/kogito-data-index-postgresql-image/resources/incubator-kie-kogito-data-index-postgresql-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
name: "docker.io/apache/incubator-kie-kogito-data-index-ephemeral"
version: "main"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20"
description: "Runtime image for Kogito Data Index Service for PostgreSQL
persistence provider"
labels:
diff --git
a/packages/kogito-data-index-postgresql-image/resources/modules/kogito-data-index-postgresql/module.yaml
b/packages/kogito-data-index-postgresql-image/resources/modules/kogito-data-index-postgresql/module.yaml
index 43c9fe6d9e9..ec56b961158 100644
---
a/packages/kogito-data-index-postgresql-image/resources/modules/kogito-data-index-postgresql/module.yaml
+++
b/packages/kogito-data-index-postgresql-image/resources/modules/kogito-data-index-postgresql/module.yaml
@@ -20,12 +20,10 @@ schema_version: 1
name: org.kie.kogito.dataindex.postgresql
version: "main"
-# see build-kogito-apps-components.sh script, responsible for build it.
-# called by the Makefile before builds
+# Relative to build/target/image/modules/, that's why the four `../`
artifacts:
- - path: /tmp/build/data-index-service-postgresql
- dest: /home/kogito/bin
- name: quarkus-app
+ - path: ../../../../app/target/quarkus-app
+ dest: /home/kogito/bin/quarkus-app
execute:
- script: configure
diff --git a/packages/kogito-jit-runner-image/package.json
b/packages/kogito-jit-runner-image/package.json
index e0e51502041..dc1def35950 100644
--- a/packages/kogito-jit-runner-image/package.json
+++ b/packages/kogito-jit-runner-image/package.json
@@ -13,7 +13,7 @@
"url": "https://github.com/apache/incubator-kie-tools/issues"
},
"scripts": {
- "build:dev": "run-script-if --bool \"$(build-env containerImages.build)\"
--then \"pnpm copy-assets\" \"pnpm image:build\"",
+ "build:dev": "run-script-if --bool \"$(build-env containerImages.build)\"
--then \"pnpm mvn-build-app\" \"pnpm copy-assets\" \"pnpm image:build\"",
"build:prod": "pnpm build:dev && pnpm image:test",
"copy-assets": "run-script-os",
"copy-assets:linux:darwin": "rimraf build && cp -R
./node_modules/@kie-tools/sonataflow-image-common/resources build && cp -R
resources/* build",
@@ -21,15 +21,19 @@
"copy-test-assets:linux:darwin": "cp -R test-resources/. build",
"format": "prettier --write . --ignore-path=../../.prettierignore
--ignore-path=../../.gitignore",
"image:build": "run-script-os",
- "image:build:darwin:linux": "pnpm setup:env make -C ./build
build-kogito-app build",
+ "image:build:darwin:linux": "pnpm setup:env make -C ./build build",
"image:build:win32": "echo \"Build skipped on Windows\"",
- "image:test": "run-script-if --ignore-errors \"$(build-env
tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then
\"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p
build/target/test/results && cp -R build/target/test/results dist-tests-e2e/\"",
+ "image:test": "run-script-if --ignore-errors \"$(build-env
tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then
\"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p
build/target/test/results\" \"cp -R build/target/test/results
dist-tests-e2e/\"",
"image:test:darwin:linux": "pnpm copy-test-assets && pnpm setup:env make
-C ./build test-image",
"image:test:win32": "echo \"Tests skipped on Windows\"",
"install": "node install.js && pnpm format",
+ "mvn-build-app": "run-script-os",
+ "mvn-build-app:linux:darwin": "mvn -am package
-Dquarkus.package.type=fast-jar -Dquarkus.container-image.build=false -B -f
./resources/app/pom.xml",
+ "mvn-build-app:win32": "echo \"Build skipped on Windows\"",
"setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate &&
cross-env KOGITO_IMAGE_REGISTRY=$(build-env kogitoJitRunnerImage.registry)
KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env kogitoJitRunnerImage.account)
KOGITO_IMAGE_NAME=$(build-env kogitoJitRunnerImage.name)
KOGITO_IMAGE_TAG=$(build-env kogitoJitRunnerImage.buildTag)
QUARKUS_PLATFORM_VERSION=$(build-env versions.quarkus)
KOGITO_VERSION=$(build-env versions.kogito)"
},
"devDependencies": {
+ "@kie-tools/maven-base": "workspace:*",
"@kie-tools/python-venv": "workspace:*",
"@kie-tools/root-env": "workspace:*",
"@kie-tools/sonataflow-image-common": "workspace:*",
diff --git a/packages/kogito-jit-runner-image/resources/app/pom.xml
b/packages/kogito-jit-runner-image/resources/app/pom.xml
new file mode 100644
index 00000000000..8c2fe83217c
--- /dev/null
+++ b/packages/kogito-jit-runner-image/resources/app/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+-->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.kie</groupId>
+ <artifactId>kie-tools-maven-base</artifactId>
+ <version>${revision}</version>
+
<relativePath>../../node_modules/@kie-tools/maven-base/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>kogito-jit-runner-image-app</artifactId>
+ <version>${revision}</version>
+
+ <name>KIE Tools :: Kogito JIT Runner Image :: App</name>
+ <description>Kogito JIT Runner Image Quarkus App</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.kie.kogito</groupId>
+ <artifactId>jitexecutor-runner</artifactId>
+ <version>${version.org.kie.kogito}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git
a/packages/kogito-jit-runner-image/resources/incubator-kie-kogito-jit-runner-image.yaml
b/packages/kogito-jit-runner-image/resources/incubator-kie-kogito-jit-runner-image.yaml
index e6b453f6112..323a6cc1d50 100644
---
a/packages/kogito-jit-runner-image/resources/incubator-kie-kogito-jit-runner-image.yaml
+++
b/packages/kogito-jit-runner-image/resources/incubator-kie-kogito-jit-runner-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
name: "docker.io/apache/incubator-kie-kogito-jit-runner"
version: "main"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20"
description: "Runtime image for Kogito JIT Runner"
labels:
diff --git
a/packages/kogito-jit-runner-image/resources/modules/kogito-jit-runner/module.yaml
b/packages/kogito-jit-runner-image/resources/modules/kogito-jit-runner/module.yaml
index db1d8ec4666..58355012470 100644
---
a/packages/kogito-jit-runner-image/resources/modules/kogito-jit-runner/module.yaml
+++
b/packages/kogito-jit-runner-image/resources/modules/kogito-jit-runner/module.yaml
@@ -20,12 +20,10 @@ schema_version: 1
name: org.kie.kogito.jit-runner
version: "main"
-# see build-kogito-apps-components.sh script, responsible for build it.
-# called by the Makefile before builds
+# Relative to build/target/image/modules/, that's why the four `../`
artifacts:
- - path: /tmp/build/jitexecutor-runner
- dest: /home/kogito/bin
- name: quarkus-app
+ - path: ../../../../app/target/quarkus-app
+ dest: /home/kogito/bin/quarkus-app
execute:
- script: configure
diff --git a/packages/kogito-jobs-service-allinone-image/package.json
b/packages/kogito-jobs-service-allinone-image/package.json
index 00f2ec3aeb9..132b3b59afd 100644
--- a/packages/kogito-jobs-service-allinone-image/package.json
+++ b/packages/kogito-jobs-service-allinone-image/package.json
@@ -13,7 +13,7 @@
"url": "https://github.com/apache/incubator-kie-tools/issues"
},
"scripts": {
- "build:dev": "run-script-if --bool \"$(build-env containerImages.build)\"
--then \"pnpm copy-assets\" \"pnpm image:build\"",
+ "build:dev": "run-script-if --bool \"$(build-env containerImages.build)\"
--then \"pnpm mvn-build-app\" \"pnpm copy-assets\" \"pnpm image:build\"",
"build:prod": "pnpm build:dev && pnpm image:test",
"copy-assets": "run-script-os",
"copy-assets:linux:darwin": "rimraf build && cp -R
./node_modules/@kie-tools/sonataflow-image-common/resources build && cp -R
resources/* build",
@@ -21,15 +21,19 @@
"copy-test-assets:linux:darwin": "cp -R test-resources/. build",
"format": "prettier --write . --ignore-path=../../.prettierignore
--ignore-path=../../.gitignore",
"image:build": "run-script-os",
- "image:build:darwin:linux": "pnpm setup:env make -C ./build
build-kogito-app build",
+ "image:build:darwin:linux": "pnpm setup:env make -C ./build build",
"image:build:win32": "echo \"Build skipped on Windows\"",
- "image:test": "run-script-if --ignore-errors \"$(build-env
tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then
\"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p
build/target/test/results && cp -R build/target/test/results dist-tests-e2e/\"",
+ "image:test": "run-script-if --ignore-errors \"$(build-env
tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then
\"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p
build/target/test/results\" \"cp -R build/target/test/results
dist-tests-e2e/\"",
"image:test:darwin:linux": "pnpm copy-test-assets && pnpm setup:env make
-C ./build test-image",
"image:test:win32": "echo \"Tests skipped on Windows\"",
"install": "node install.js && pnpm format",
+ "mvn-build-app": "run-script-os",
+ "mvn-build-app:linux:darwin": "mvn -am package
-Dquarkus.package.type=fast-jar -Dquarkus.container-image.build=false -B -f
./resources/app/pom.xml",
+ "mvn-build-app:win32": "echo \"Build skipped on Windows\"",
"setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate &&
cross-env KOGITO_IMAGE_REGISTRY=$(build-env
kogitoJobsServiceAllInOneImage.registry)
KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env
kogitoJobsServiceAllInOneImage.account) KOGITO_IMAGE_NAME=$(build-env
kogitoJobsServiceAllInOneImage.name) KOGITO_IMAGE_TAG=$(build-env
kogitoJobsServiceAllInOneImage.buildTag) QUARKUS_PLATFORM_VERSION=$(build-env
versions.quarkus) KOGITO_VERSION=$(build-env versions.kogito)"
},
"devDependencies": {
+ "@kie-tools/maven-base": "workspace:*",
"@kie-tools/python-venv": "workspace:*",
"@kie-tools/root-env": "workspace:*",
"@kie-tools/sonataflow-image-common": "workspace:*",
diff --git
a/packages/kogito-jobs-service-allinone-image/resources/app/ephemeral/pom.xml
b/packages/kogito-jobs-service-allinone-image/resources/app/ephemeral/pom.xml
new file mode 100644
index 00000000000..d0699004862
--- /dev/null
+++
b/packages/kogito-jobs-service-allinone-image/resources/app/ephemeral/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+-->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.kie</groupId>
+ <artifactId>kogito-jobs-service-image-parent</artifactId>
+ <version>${revision}</version>
+ </parent>
+
+ <artifactId>kogito-jobs-service-inmemory-image-app</artifactId>
+ <version>${revision}</version>
+
+ <name>KIE Tools :: Kogito Jobs Service Inmemory Image :: App</name>
+ <description>Kogito Jobs Service Inmemory Image Quarkus App</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.kie.kogito</groupId>
+ <artifactId>jobs-service-inmemory</artifactId>
+ <version>${version.org.kie.kogito}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/packages/kogito-jobs-service-allinone-image/resources/app/pom.xml
b/packages/kogito-jobs-service-allinone-image/resources/app/pom.xml
new file mode 100644
index 00000000000..d9ef6a0be43
--- /dev/null
+++ b/packages/kogito-jobs-service-allinone-image/resources/app/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+-->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.kie</groupId>
+ <artifactId>kie-tools-maven-base</artifactId>
+ <version>${revision}</version>
+
<relativePath>../../node_modules/@kie-tools/maven-base/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>kogito-jobs-service-image-parent</artifactId>
+ <version>${revision}</version>
+ <packaging>pom</packaging>
+
+ <name>KIE Tools :: Kogito Jobs Service Image :: Parent</name>
+ <description>Kogito Kogito Jobs Service Image Parent</description>
+
+ <modules>
+ <module>ephemeral</module>
+ <module>postgresql</module>
+ </modules>
+</project>
diff --git
a/packages/kogito-jobs-service-allinone-image/resources/app/postgresql/pom.xml
b/packages/kogito-jobs-service-allinone-image/resources/app/postgresql/pom.xml
new file mode 100644
index 00000000000..3b329361104
--- /dev/null
+++
b/packages/kogito-jobs-service-allinone-image/resources/app/postgresql/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+-->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.kie</groupId>
+ <artifactId>kogito-jobs-service-image-parent</artifactId>
+ <version>${revision}</version>
+ </parent>
+
+ <artifactId>kogito-jobs-service-postgresql-image-app</artifactId>
+ <version>${revision}</version>
+
+ <name>KIE Tools :: Kogito Jobs Service Postgresql Image :: App</name>
+ <description>Kogito Kogito Jobs Service Postgresql Image Quarkus
App</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.kie.kogito</groupId>
+ <artifactId>jobs-service-postgresql</artifactId>
+ <version>${version.org.kie.kogito}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git
a/packages/kogito-jobs-service-allinone-image/resources/incubator-kie-kogito-jobs-service-allinone-image.yaml
b/packages/kogito-jobs-service-allinone-image/resources/incubator-kie-kogito-jobs-service-allinone-image.yaml
index eb63de643ee..2872d6a0132 100644
---
a/packages/kogito-jobs-service-allinone-image/resources/incubator-kie-kogito-jobs-service-allinone-image.yaml
+++
b/packages/kogito-jobs-service-allinone-image/resources/incubator-kie-kogito-jobs-service-allinone-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
name: "docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral"
version: "main"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20"
description: "Runtime image for Kogito Jobs Service with all available jdbc
providers"
labels:
diff --git
a/packages/kogito-jobs-service-allinone-image/resources/modules/kogito-jobs-service-all-in-one/module.yaml
b/packages/kogito-jobs-service-allinone-image/resources/modules/kogito-jobs-service-all-in-one/module.yaml
index 1963808b63d..244300c4d04 100644
---
a/packages/kogito-jobs-service-allinone-image/resources/modules/kogito-jobs-service-all-in-one/module.yaml
+++
b/packages/kogito-jobs-service-allinone-image/resources/modules/kogito-jobs-service-all-in-one/module.yaml
@@ -21,12 +21,12 @@ name: org.kie.kogito.jobs.service.allinone
version: "main"
artifacts:
- - path: /tmp/build/jobs-service-inmemory-all-in-one
+ - path: ../../../../app/ephemeral/target/quarkus-app
+ dest: /home/kogito/bin/ephemeral/quarkus-app
name: jobs-service-inmemory-all-in-one
- dest: /home/kogito/bin/ephemeral
- - path: /tmp/build/jobs-service-postgresql-all-in-one
+ - path: ../../../../app/postgresql/target/quarkus-app
+ dest: /home/kogito/bin/postgresql/quarkus-app
name: jobs-service-postgresql-all-in-one
- dest: /home/kogito/bin/postgresql
execute:
- script: configure
diff --git a/packages/kogito-jobs-service-ephemeral-image/package.json
b/packages/kogito-jobs-service-ephemeral-image/package.json
index be288a815f4..bf9c76b7c8a 100644
--- a/packages/kogito-jobs-service-ephemeral-image/package.json
+++ b/packages/kogito-jobs-service-ephemeral-image/package.json
@@ -13,7 +13,7 @@
"url": "https://github.com/apache/incubator-kie-tools/issues"
},
"scripts": {
- "build:dev": "run-script-if --bool \"$(build-env containerImages.build)\"
--then \"pnpm copy-assets\" \"pnpm image:build\"",
+ "build:dev": "run-script-if --bool \"$(build-env containerImages.build)\"
--then \"pnpm mvn-build-app\" \"pnpm copy-assets\" \"pnpm image:build\"",
"build:prod": "pnpm build:dev && pnpm image:test",
"copy-assets": "run-script-os",
"copy-assets:linux:darwin": "rimraf build && cp -R
./node_modules/@kie-tools/sonataflow-image-common/resources build && cp -R
resources/* build",
@@ -21,15 +21,19 @@
"copy-test-assets:linux:darwin": "cp -R test-resources/. build",
"format": "prettier --write . --ignore-path=../../.prettierignore
--ignore-path=../../.gitignore",
"image:build": "run-script-os",
- "image:build:darwin:linux": "pnpm setup:env make -C ./build
build-kogito-app build",
+ "image:build:darwin:linux": "pnpm setup:env make -C ./build build",
"image:build:win32": "echo \"Build skipped on Windows\"",
- "image:test": "run-script-if --ignore-errors \"$(build-env
tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then
\"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p
build/target/test/results && cp -R build/target/test/results dist-tests-e2e/\"",
+ "image:test": "run-script-if --ignore-errors \"$(build-env
tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then
\"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p
build/target/test/results\" \"cp -R build/target/test/results
dist-tests-e2e/\"",
"image:test:darwin:linux": "pnpm copy-test-assets && pnpm setup:env make
-C ./build test-image",
"image:test:win32": "echo \"Tests skipped on Windows\"",
"install": "node install.js && pnpm format",
+ "mvn-build-app": "run-script-os",
+ "mvn-build-app:linux:darwin": "mvn -am package
-Dquarkus.package.type=fast-jar -Dquarkus.container-image.build=false -B -f
./resources/app/pom.xml",
+ "mvn-build-app:win32": "echo \"Build skipped on Windows\"",
"setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate &&
cross-env KOGITO_IMAGE_REGISTRY=$(build-env
kogitoJobsServiceEphemeralImage.registry)
KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env
kogitoJobsServiceEphemeralImage.account) KOGITO_IMAGE_NAME=$(build-env
kogitoJobsServiceEphemeralImage.name) KOGITO_IMAGE_TAG=$(build-env
kogitoJobsServiceEphemeralImage.buildTag) QUARKUS_PLATFORM_VERSION=$(build-env
versions.quarkus) KOGITO_VERSION=$(build-env versions.kogito)"
},
"devDependencies": {
+ "@kie-tools/maven-base": "workspace:*",
"@kie-tools/python-venv": "workspace:*",
"@kie-tools/root-env": "workspace:*",
"@kie-tools/sonataflow-image-common": "workspace:*",
diff --git a/packages/kogito-jobs-service-ephemeral-image/resources/app/pom.xml
b/packages/kogito-jobs-service-ephemeral-image/resources/app/pom.xml
new file mode 100644
index 00000000000..ab1afd2aba6
--- /dev/null
+++ b/packages/kogito-jobs-service-ephemeral-image/resources/app/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+-->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.kie</groupId>
+ <artifactId>kie-tools-maven-base</artifactId>
+ <version>${revision}</version>
+
<relativePath>../../node_modules/@kie-tools/maven-base/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>kogito-jobs-service-inmemory-image-app</artifactId>
+ <version>${revision}</version>
+
+ <name>KIE Tools :: Kogito Jobs Service Inmemory Image :: App</name>
+ <description>Kogito Jobs Service Inmemory Image Quarkus App</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.kie.kogito</groupId>
+ <artifactId>jobs-service-inmemory</artifactId>
+ <version>${version.org.kie.kogito}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git
a/packages/kogito-jobs-service-ephemeral-image/resources/incubator-kie-kogito-jobs-service-ephemeral-image.yaml
b/packages/kogito-jobs-service-ephemeral-image/resources/incubator-kie-kogito-jobs-service-ephemeral-image.yaml
index 92536ef40f5..f622fec9eed 100644
---
a/packages/kogito-jobs-service-ephemeral-image/resources/incubator-kie-kogito-jobs-service-ephemeral-image.yaml
+++
b/packages/kogito-jobs-service-ephemeral-image/resources/incubator-kie-kogito-jobs-service-ephemeral-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
name: "docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral"
version: "main"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20"
description: "Runtime image for Kogito in memory Jobs Service"
labels:
diff --git
a/packages/kogito-jobs-service-ephemeral-image/resources/modules/added/kogito-app-launch.sh
b/packages/kogito-jobs-service-ephemeral-image/resources/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
similarity index 96%
rename from
packages/kogito-jobs-service-ephemeral-image/resources/modules/added/kogito-app-launch.sh
rename to
packages/kogito-jobs-service-ephemeral-image/resources/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
index 66b2da357fe..0f470cac6d3 100644
---
a/packages/kogito-jobs-service-ephemeral-image/resources/modules/added/kogito-app-launch.sh
+++
b/packages/kogito-jobs-service-ephemeral-image/resources/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
@@ -45,4 +45,4 @@
DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-option
exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS}
${KOGITO_JOBS_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
-Dquarkus.http.host=0.0.0.0 \
-Dquarkus.http.port=8080 \
- -jar "${KOGITO_HOME}"/bin/ephemeral/quarkus-app/quarkus-run.jar
+ -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
diff --git
a/packages/kogito-jobs-service-ephemeral-image/resources/modules/configure
b/packages/kogito-jobs-service-ephemeral-image/resources/modules/kogito-jobs-service-ephemeral/configure
similarity index 100%
rename from
packages/kogito-jobs-service-ephemeral-image/resources/modules/configure
rename to
packages/kogito-jobs-service-ephemeral-image/resources/modules/kogito-jobs-service-ephemeral/configure
diff --git
a/packages/kogito-jobs-service-ephemeral-image/resources/modules/module.yaml
b/packages/kogito-jobs-service-ephemeral-image/resources/modules/kogito-jobs-service-ephemeral/module.yaml
similarity index 81%
rename from
packages/kogito-jobs-service-ephemeral-image/resources/modules/module.yaml
rename to
packages/kogito-jobs-service-ephemeral-image/resources/modules/kogito-jobs-service-ephemeral/module.yaml
index b320c789219..dc0020ddada 100644
--- a/packages/kogito-jobs-service-ephemeral-image/resources/modules/module.yaml
+++
b/packages/kogito-jobs-service-ephemeral-image/resources/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -20,12 +20,10 @@ schema_version: 1
name: org.kie.kogito.jobs.service.ephemeral
version: "main"
-# see build-kogito-apps-components.sh script, responsible for build it.
-# called by the Makefile before builds
+# Relative to build/target/image/modules/, that's why the four `../`
artifacts:
- - path: /tmp/build/jobs-service-inmemory
- dest: /home/kogito/bin/ephemeral
- name: quarkus-app
+ - path: ../../../../app/target/quarkus-app
+ dest: /home/kogito/bin/quarkus-app
execute:
- script: configure
diff --git
a/packages/kogito-jobs-service-ephemeral-image/test-resources/tests/features/kogito-jobs-service-ephemeral.feature
b/packages/kogito-jobs-service-ephemeral-image/test-resources/tests/features/kogito-jobs-service-ephemeral.feature
index bb0102bc084..f9458b09d65 100644
---
a/packages/kogito-jobs-service-ephemeral-image/test-resources/tests/features/kogito-jobs-service-ephemeral.feature
+++
b/packages/kogito-jobs-service-ephemeral-image/test-resources/tests/features/kogito-jobs-service-ephemeral.feature
@@ -30,13 +30,13 @@ Feature: Kogito-jobs-service-ephemeral feature.
Scenario: Verify if the application jar exists
When container is started with command bash
- Then run sh -c 'ls /home/kogito/bin/ephemeral/quarkus-app/quarkus-run.jar'
in container and immediately check its output for
/home/kogito/bin/ephemeral/quarkus-app/quarkus-run.jar
+ Then run sh -c 'ls /home/kogito/bin/quarkus-app/quarkus-run.jar' in
container and immediately check its output for
/home/kogito/bin/quarkus-app/quarkus-run.jar
Scenario: Verify if the debug is correctly enabled with the ephemeral jar
When container is started with env
| variable | value |
| SCRIPT_DEBUG | true |
- Then container log should contain -Dquarkus.http.host=0.0.0.0
-Dquarkus.http.port=8080 -jar
/home/kogito/bin/ephemeral/quarkus-app/quarkus-run.jar
+ 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 started in
And container log should not contain Application failed to start
diff --git a/packages/kogito-jobs-service-postgresql-image/package.json
b/packages/kogito-jobs-service-postgresql-image/package.json
index 788ea1912a6..cb22dbfa6f1 100644
--- a/packages/kogito-jobs-service-postgresql-image/package.json
+++ b/packages/kogito-jobs-service-postgresql-image/package.json
@@ -13,7 +13,7 @@
"url": "https://github.com/apache/incubator-kie-tools/issues"
},
"scripts": {
- "build:dev": "run-script-if --bool \"$(build-env containerImages.build)\"
--then \"pnpm copy-assets\" \"pnpm image:build\"",
+ "build:dev": "run-script-if --bool \"$(build-env containerImages.build)\"
--then \"pnpm mvn-build-app\" \"pnpm copy-assets\" \"pnpm image:build\"",
"build:prod": "pnpm build:dev && pnpm image:test",
"copy-assets": "run-script-os",
"copy-assets:linux:darwin": "rimraf build && cp -R
./node_modules/@kie-tools/sonataflow-image-common/resources build && cp -R
resources/* build",
@@ -21,15 +21,19 @@
"copy-test-assets:linux:darwin": "cp -R test-resources/. build",
"format": "prettier --write . --ignore-path=../../.prettierignore
--ignore-path=../../.gitignore",
"image:build": "run-script-os",
- "image:build:darwin:linux": "pnpm setup:env make -C ./build
build-kogito-app build",
+ "image:build:darwin:linux": "pnpm setup:env make -C ./build build",
"image:build:win32": "echo \"Build skipped on Windows\"",
- "image:test": "run-script-if --ignore-errors \"$(build-env
tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then
\"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p
build/target/test/results && cp -R build/target/test/results dist-tests-e2e/\"",
+ "image:test": "run-script-if --ignore-errors \"$(build-env
tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then
\"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p
build/target/test/results\" \"cp -R build/target/test/results
dist-tests-e2e/\"",
"image:test:darwin:linux": "pnpm copy-test-assets && pnpm setup:env make
-C ./build test-image",
"image:test:win32": "echo \"Tests skipped on Windows\"",
"install": "node install.js && pnpm format",
+ "mvn-build-app": "run-script-os",
+ "mvn-build-app:linux:darwin": "mvn -am package
-Dquarkus.package.type=fast-jar -Dquarkus.container-image.build=false -B -f
./resources/app/pom.xml",
+ "mvn-build-app:win32": "echo \"Build skipped on Windows\"",
"setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate &&
cross-env KOGITO_IMAGE_REGISTRY=$(build-env
kogitoJobsServicePostgresqlImage.registry)
KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env
kogitoJobsServicePostgresqlImage.account) KOGITO_IMAGE_NAME=$(build-env
kogitoJobsServicePostgresqlImage.name) KOGITO_IMAGE_TAG=$(build-env
kogitoJobsServicePostgresqlImage.buildTag) QUARKUS_PLATFORM_VERSION=$(build-env
versions.quarkus) KOGITO_VERSION=$(build-env versions.kogito)"
},
"devDependencies": {
+ "@kie-tools/maven-base": "workspace:*",
"@kie-tools/python-venv": "workspace:*",
"@kie-tools/root-env": "workspace:*",
"@kie-tools/sonataflow-image-common": "workspace:*",
diff --git
a/packages/kogito-jobs-service-postgresql-image/resources/app/pom.xml
b/packages/kogito-jobs-service-postgresql-image/resources/app/pom.xml
new file mode 100644
index 00000000000..61e48009f51
--- /dev/null
+++ b/packages/kogito-jobs-service-postgresql-image/resources/app/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+-->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.kie</groupId>
+ <artifactId>kie-tools-maven-base</artifactId>
+ <version>${revision}</version>
+
<relativePath>../../node_modules/@kie-tools/maven-base/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>kogito-jobs-service-postgresql-image-app</artifactId>
+ <version>${revision}</version>
+
+ <name>KIE Tools :: Kogito Jobs Service Postgresql Image :: App</name>
+ <description>Kogito Kogito Jobs Service Postgresql Image Quarkus
App</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.kie.kogito</groupId>
+ <artifactId>jobs-service-postgresql</artifactId>
+ <version>${version.org.kie.kogito}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git
a/packages/kogito-jobs-service-postgresql-image/resources/incubator-kie-kogito-jobs-service-postgresql-image.yaml
b/packages/kogito-jobs-service-postgresql-image/resources/incubator-kie-kogito-jobs-service-postgresql-image.yaml
index 8458b48a849..f2ccc8bc2c5 100644
---
a/packages/kogito-jobs-service-postgresql-image/resources/incubator-kie-kogito-jobs-service-postgresql-image.yaml
+++
b/packages/kogito-jobs-service-postgresql-image/resources/incubator-kie-kogito-jobs-service-postgresql-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
name: "docker.io/apache/incubator-kie-kogito-jobs-service-postgresql"
version: "main"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20"
description: "Runtime image for Kogito Jobs Service based on Postgresql"
labels:
diff --git
a/packages/kogito-jobs-service-postgresql-image/resources/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
b/packages/kogito-jobs-service-postgresql-image/resources/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
index 4ee5b43d62b..0f470cac6d3 100644
---
a/packages/kogito-jobs-service-postgresql-image/resources/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
+++
b/packages/kogito-jobs-service-postgresql-image/resources/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
@@ -45,4 +45,4 @@
DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-option
exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS}
${KOGITO_JOBS_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
-Dquarkus.http.host=0.0.0.0 \
-Dquarkus.http.port=8080 \
- -jar "${KOGITO_HOME}"/bin/postgresql/quarkus-app/quarkus-run.jar
+ -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
diff --git
a/packages/kogito-jobs-service-postgresql-image/resources/modules/kogito-jobs-service-postgresql/module.yaml
b/packages/kogito-jobs-service-postgresql-image/resources/modules/kogito-jobs-service-postgresql/module.yaml
index 6bdc6b692cc..c5fcb2a5bc3 100644
---
a/packages/kogito-jobs-service-postgresql-image/resources/modules/kogito-jobs-service-postgresql/module.yaml
+++
b/packages/kogito-jobs-service-postgresql-image/resources/modules/kogito-jobs-service-postgresql/module.yaml
@@ -20,12 +20,10 @@ schema_version: 1
name: org.kie.kogito.jobs.service.postgresql
version: "main"
-# see build-kogito-apps-components.sh script, responsible for build it.
-# called by the Makefile before builds
+# Relative to build/target/image/modules/, that's why the four `../`
artifacts:
- - path: /tmp/build/jobs-service-postgresql
- dest: /home/kogito/bin/postgresql
- name: quarkus-app
+ - path: ../../../../app/target/quarkus-app
+ dest: /home/kogito/bin/quarkus-app
execute:
- script: configure
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 4c601a9d361..c8aa91d8fb8 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
@@ -30,7 +30,7 @@ Feature: Kogito-jobs-service-postgresql feature.
Scenario: Verify if the application jar exists
When container is started with command bash
- Then run sh -c 'ls
/home/kogito/bin/postgresql/quarkus-app/quarkus-run.jar' in container and
immediately check its output for
/home/kogito/bin/postgresql/quarkus-app/quarkus-run.jar
+ Then run sh -c 'ls /home/kogito/bin/quarkus-app/quarkus-run.jar' in
container and immediately check its output for
/home/kogito/bin/quarkus-app/quarkus-run.jar
Scenario: verify if container starts as expected
When container is started with env
@@ -41,7 +41,7 @@ Feature: Kogito-jobs-service-postgresql feature.
| QUARKUS_DATASOURCE_USERNAME | test
|
| QUARKUS_DATASOURCE_PASSWORD | 123456
|
| QUARKUS_DATASOURCE_JDBC_URL |
jdbc: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/postgresql/quarkus-app/quarkus-run.jar
+ 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 QUARKUS_DATASOURCE_DB_KIND=postgresql
And container log should contain QUARKUS_DATASOURCE_USERNAME=test
And container log should contain QUARKUS_DATASOURCE_PASSWORD=123456
diff --git a/packages/sonataflow-image-common/resources/Makefile
b/packages/sonataflow-image-common/resources/Makefile
index 834de6f6efc..7f72573fb18 100644
--- a/packages/sonataflow-image-common/resources/Makefile
+++ b/packages/sonataflow-image-common/resources/Makefile
@@ -66,12 +66,6 @@ _create_e2e_dir:
rm -rf ../dist-tests-e2e
mkdir ../dist-tests-e2e
-# Pull kogito-apps repo and build the target kogito-apps depending on the
`KOGITO_IMAGE_NAME`s
-# Required for kogito-apps images only
-.PHONY build-kogito-app: _build_kogito_app
-_build_kogito_app:
- scripts/build-kogito-apps-components.sh ${KOGITO_IMAGE_NAME}
${KOGITO_VERSION} ${KOGITO_APPS_TARGET_URI};
-
# Trigger the image tests
.PHONY test-image: _create_e2e_dir _check_kogito_image_name _test_image
_test_image:
diff --git
a/packages/sonataflow-image-common/resources/modules/kogito-maven/tests/bats/maven-settings.bats
b/packages/sonataflow-image-common/resources/modules/kogito-maven/common/tests/bats/maven-settings.bats
similarity index 99%
rename from
packages/sonataflow-image-common/resources/modules/kogito-maven/tests/bats/maven-settings.bats
rename to
packages/sonataflow-image-common/resources/modules/kogito-maven/common/tests/bats/maven-settings.bats
index 66fb2363532..8e74bf8718f 100644
---
a/packages/sonataflow-image-common/resources/modules/kogito-maven/tests/bats/maven-settings.bats
+++
b/packages/sonataflow-image-common/resources/modules/kogito-maven/common/tests/bats/maven-settings.bats
@@ -20,13 +20,13 @@
# imports
-source $BATS_TEST_DIRNAME/../../common/added/configure-maven.sh
+source $BATS_TEST_DIRNAME/../../added/configure-maven.sh
setup() {
export KOGITO_HOME=$BATS_TMPDIR/maven
mkdir -p ${KOGITO_HOME}/.m2/
- cp $BATS_TEST_DIRNAME/../../common/maven/settings.xml ${KOGITO_HOME}/.m2/
+ cp $BATS_TEST_DIRNAME/../../maven/settings.xml ${KOGITO_HOME}/.m2/
export MAVEN_SETTINGS_PATH="${KOGITO_HOME}/.m2/settings.xml"
}
diff --git a/packages/sonataflow-image-common/resources/scripts/README.md
b/packages/sonataflow-image-common/resources/scripts/README.md
index 34a4fcd0c85..589ecacfae8 100644
--- a/packages/sonataflow-image-common/resources/scripts/README.md
+++ b/packages/sonataflow-image-common/resources/scripts/README.md
@@ -63,10 +63,6 @@ Usage:
- `--quarkus-version`: Sets the Quarkus version
- `--kogito-version`: Sets the Kogito version
-## Build Kogito Apps Components
-
-The [build-kogito-apps-components.sh](build-kogito-apps-components.sh) script
pulls and build the target Kogito Apps application, e.g., Data Index. Required
to build Kogito Services images in any flavour.
-
## Setup Maven
The [setup-maven.sh](setup-maven.sh) script configures the internal image
Maven repository such as adding new repositories, setup other profiles and so
on.
diff --git a/packages/sonataflow-image-common/resources/scripts/common.py
b/packages/sonataflow-image-common/resources/scripts/common.py
index 30cbdc44c93..35ce2c44462 100644
--- a/packages/sonataflow-image-common/resources/scripts/common.py
+++ b/packages/sonataflow-image-common/resources/scripts/common.py
@@ -268,7 +268,7 @@ def update_label_value_in_file(filename, label_name,
label_value):
:param label_name: label name to update
:param label_value: value to set
"""
- print("Updating {0} label {1} with value {2}".format(filename, label_name,
label_value))
+ print(f"Updating {filename} label {label_name} with value {label_value}")
try:
with open(filename) as yaml_file:
data = yaml_loader().load(yaml_file)
@@ -281,7 +281,7 @@ def update_label_value_in_file(filename, label_name,
label_value):
raise
-def update_label_value_in_data(data, label_name, label_value, ignore_empty =
False):
+def update_label_value_in_data(data, label_name, label_value,
ignore_empty=False):
"""
Update label value in data dict if exists
:param data: dict to update
@@ -296,7 +296,7 @@ def update_label_value_in_data(data, label_name,
label_value, ignore_empty = Fal
if ignore_empty:
if 'labels' not in data:
data['labels'] = []
- data['labels'] += [ dict(name=label_name, value=label_value) ]
+ data['labels'] += [dict(name=label_name, value=label_value)]
elif 'labels' in data:
for _, label in enumerate(data['labels'], start=0):
if label['name'] == label_name:
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a7977bd811f..a4ffd3565ce 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -852,13 +852,13 @@ importers:
version: 1.67.0
jest:
specifier: ^29.7.0
- version:
29.7.0(@types/[email protected])([email protected])([email protected](@types/[email protected])([email protected]))
+ version:
29.7.0(@types/[email protected])([email protected])([email protected](@types/[email protected])([email protected]))
jest-junit:
specifier: ^16.0.0
version: 16.0.0
jest-when:
specifier: ^3.6.0
- version:
3.6.0([email protected](@types/[email protected])([email protected])([email protected](@types/[email protected])([email protected])))
+ version:
3.6.0([email protected](@types/[email protected])([email protected])([email protected](@types/[email protected])([email protected])))
rimraf:
specifier: ^3.0.2
version: 3.0.2
@@ -867,7 +867,7 @@ importers:
version: 0.0.2
ts-jest:
specifier: ^29.1.5
- version:
29.1.5(@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected](@types/[email protected])([email protected])([email protected](@types/[email protected])([email protected])))([email protected])
+ version:
29.1.5(@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected](@types/[email protected])([email protected])([email protected](@types/[email protected])([email protected])))([email protected])
typescript:
specifier: ^5.5.3
version: 5.5.3
@@ -1021,13 +1021,13 @@ importers:
version:
6.2.0([email protected](@swc/[email protected])([email protected])([email protected]))
jest:
specifier: ^29.7.0
- version:
29.7.0(@types/[email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))
+ version:
29.7.0(@types/[email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))
jest-junit:
specifier: ^16.0.0
version: 16.0.0
jest-when:
specifier: ^3.6.0
- version:
3.6.0([email protected](@types/[email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected])))
+ version:
3.6.0([email protected](@types/[email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected])))
react-json-view:
specifier: ^1.21.3
version:
1.21.3(@types/[email protected])([email protected]([email protected]))([email protected])
@@ -1042,7 +1042,7 @@ importers:
version: 7.4.6
ts-jest:
specifier: ^29.1.5
- version:
29.1.5(@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected](@types/[email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected])))([email protected])
+ version:
29.1.5(@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected](@types/[email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected])))([email protected])
typescript:
specifier: ^5.5.3
version: 5.5.3
@@ -6402,6 +6402,9 @@ importers:
packages/kogito-data-index-ephemeral-image:
devDependencies:
+ '@kie-tools/maven-base':
+ specifier: workspace:*
+ version: link:../maven-base
'@kie-tools/python-venv':
specifier: workspace:*
version: link:../python-venv
@@ -6426,6 +6429,9 @@ importers:
packages/kogito-data-index-postgresql-image:
devDependencies:
+ '@kie-tools/maven-base':
+ specifier: workspace:*
+ version: link:../maven-base
'@kie-tools/python-venv':
specifier: workspace:*
version: link:../python-venv
@@ -6450,6 +6456,9 @@ importers:
packages/kogito-jit-runner-image:
devDependencies:
+ '@kie-tools/maven-base':
+ specifier: workspace:*
+ version: link:../maven-base
'@kie-tools/python-venv':
specifier: workspace:*
version: link:../python-venv
@@ -6474,6 +6483,9 @@ importers:
packages/kogito-jobs-service-allinone-image:
devDependencies:
+ '@kie-tools/maven-base':
+ specifier: workspace:*
+ version: link:../maven-base
'@kie-tools/python-venv':
specifier: workspace:*
version: link:../python-venv
@@ -6498,6 +6510,9 @@ importers:
packages/kogito-jobs-service-ephemeral-image:
devDependencies:
+ '@kie-tools/maven-base':
+ specifier: workspace:*
+ version: link:../maven-base
'@kie-tools/python-venv':
specifier: workspace:*
version: link:../python-venv
@@ -6522,6 +6537,9 @@ importers:
packages/kogito-jobs-service-postgresql-image:
devDependencies:
+ '@kie-tools/maven-base':
+ specifier: workspace:*
+ version: link:../maven-base
'@kie-tools/python-venv':
specifier: workspace:*
version: link:../python-venv
@@ -6644,8 +6662,6 @@ importers:
specifier: ^1.1.6
version: 1.1.6
- packages/maven-config-setup-helper: {}
-
packages/maven-m2-repo-via-http-image:
devDependencies:
'@kie-tools/image-builder':
@@ -19436,9 +19452,6 @@ packages:
'@types/[email protected]':
resolution: {integrity:
sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==}
- '@types/[email protected]':
- resolution: {integrity:
sha512-HhxyLejTHMfohAuhRun4csWigAMjXTmRyiJTU1Y/I1xmggikFMkOUoMQRlFm+zQcPEGHSs3io/0FAmNZf8EymQ==}
-
'@types/[email protected]':
resolution: {integrity:
sha512-DxX1V9P8zdJPYQat1gHyY0xj3efl8gnMVjiM9iCY6y27lj+PoQWkgjt8jDqmovPqULkKVpKRg8J36iQiA+EtEg==}
@@ -19709,9 +19722,6 @@ packages:
'@types/[email protected]':
resolution: {integrity:
sha512-FSYhIjFlfOpGSRyVoMBMuS3ws5ehFQODymf3vlI7U1K8c7PHwWwFY7VREfmsuzHSOnoKs/9/Y983ayOs7eRzqw==}
- '@types/[email protected]':
- resolution: {integrity:
sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==}
-
'@types/[email protected]':
resolution: {integrity:
sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==}
@@ -24213,10 +24223,6 @@ packages:
resolution: {integrity:
sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==}
engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
- [email protected]:
- resolution: {integrity:
sha512-0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ==}
- engines: {node: '>=8.0.0'}
-
[email protected]:
resolution: {integrity:
sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==}
engines: {node: '>=12.0.0'}
@@ -28105,10 +28111,6 @@ packages:
resolution: {integrity:
sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==}
hasBin: true
- [email protected]:
- resolution: {integrity:
sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==}
- engines: {npm: '>=2.0.0'}
-
[email protected]:
resolution: {integrity:
sha512-PwDt186XaL3QN5qXj/H9DGyHhP3/RYYgZZwqBv9Tv8rsAaiwFH1IsJJlcgD37J7UW5a6O67qX0KWKS3/pu0m4w==}
@@ -37826,41 +37828,6 @@ snapshots:
- supports-color
- ts-node
- '@jest/[email protected]([email protected](@types/[email protected])([email protected]))':
- dependencies:
- '@jest/console': 29.7.0
- '@jest/reporters': 29.7.0
- '@jest/test-result': 29.7.0
- '@jest/transform': 29.7.0
- '@jest/types': 29.6.3
- '@types/node': 20.14.2
- ansi-escapes: 4.3.2
- chalk: 4.1.2
- ci-info: 3.3.2
- exit: 0.1.2
- graceful-fs: 4.2.11
- jest-changed-files: 29.7.0
- jest-config:
29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))
- jest-haste-map: 29.7.0
- jest-message-util: 29.7.0
- jest-regex-util: 29.6.3
- jest-resolve: 29.7.0
- jest-resolve-dependencies: 29.7.0
- jest-runner: 29.7.0
- jest-runtime: 29.7.0
- jest-snapshot: 29.7.0
- jest-util: 29.7.0
- jest-validate: 29.7.0
- jest-watcher: 29.7.0
- micromatch: 4.0.5
- pretty-format: 29.7.0
- slash: 3.0.0
- strip-ansi: 6.0.1
- transitivePeerDependencies:
- - babel-plugin-macros
- - supports-color
- - ts-node
-
'@jest/[email protected]':
dependencies:
'@jest/fake-timers': 29.7.0
@@ -37925,6 +37892,7 @@ snapshots:
v8-to-istanbul: 9.1.3
transitivePeerDependencies:
- supports-color
+ optional: true
'@jest/[email protected]([email protected])':
dependencies:
@@ -42116,21 +42084,6 @@ snapshots:
'@types/jest': 29.5.12
jest:
29.7.0(@types/[email protected])([email protected])([email protected](@types/[email protected])([email protected]))
-
'@testing-library/[email protected](@jest/[email protected])(@types/[email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))':
- dependencies:
- '@adobe/css-tools': 4.4.0
- '@babel/runtime': 7.23.6
- aria-query: 5.1.3
- chalk: 3.0.0
- css.escape: 1.5.1
- dom-accessibility-api: 0.6.3
- lodash: 4.17.21
- redent: 3.0.0
- optionalDependencies:
- '@jest/globals': 29.7.0
- '@types/jest': 29.5.12
- jest:
29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))
-
'@testing-library/[email protected](@types/[email protected])([email protected]([email protected]))([email protected]([email protected]))([email protected])':
dependencies:
'@babel/runtime': 7.23.6
@@ -42530,11 +42483,6 @@ snapshots:
dependencies:
'@types/node': 20.14.13
- '@types/[email protected]':
- dependencies:
- '@types/through': 0.0.30
- rxjs: 6.6.7
-
'@types/[email protected]': {}
'@types/[email protected]': {}
@@ -42840,10 +42788,6 @@ snapshots:
dependencies:
'@types/jest': 29.5.12
- '@types/[email protected]':
- dependencies:
- '@types/node': 20.14.2
-
'@types/[email protected]': {}
'@types/[email protected]': {}
@@ -49507,23 +49451,6 @@ snapshots:
[email protected]: {}
- [email protected]:
- dependencies:
- ansi-escapes: 4.3.2
- chalk: 4.1.2
- cli-cursor: 3.1.0
- cli-width: 3.0.0
- external-editor: 3.1.0
- figures: 3.2.0
- lodash: 4.17.21
- mute-stream: 0.0.8
- ora: 5.4.1
- run-async: 2.4.1
- rxjs: 7.5.2
- string-width: 4.2.3
- strip-ansi: 6.0.1
- through: 2.3.8
-
[email protected]:
dependencies:
ansi-escapes: 4.3.2
@@ -50127,25 +50054,6 @@ snapshots:
- supports-color
- ts-node
-
[email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])):
- dependencies:
- '@jest/core':
29.7.0([email protected](@types/[email protected])([email protected]))
- '@jest/test-result': 29.7.0
- '@jest/types': 29.6.3
- chalk: 4.1.2
- create-jest:
29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))
- exit: 0.1.2
- import-local: 3.0.2
- jest-config:
29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))
- jest-util: 29.7.0
- jest-validate: 29.7.0
- yargs: 17.7.2
- transitivePeerDependencies:
- - '@types/node'
- - babel-plugin-macros
- - supports-color
- - ts-node
-
[email protected](@types/[email protected]):
dependencies:
'@babel/core': 7.24.9
@@ -50732,6 +50640,10 @@ snapshots:
dependencies:
jest:
29.7.0(@types/[email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))
+
[email protected]([email protected](@types/[email protected])([email protected])([email protected](@types/[email protected])([email protected]))):
+ dependencies:
+ jest:
29.7.0(@types/[email protected])([email protected])([email protected](@types/[email protected])([email protected]))
+
[email protected]([email protected](@types/[email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))):
dependencies:
jest:
29.7.0(@types/[email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))
@@ -50740,10 +50652,6 @@ snapshots:
dependencies:
jest:
29.7.0(@types/[email protected])([email protected])([email protected](@types/[email protected])([email protected]))
-
[email protected]([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected]))):
- dependencies:
- jest:
29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))
-
[email protected]:
dependencies:
merge-stream: 2.0.0
@@ -50851,18 +50759,6 @@ snapshots:
- supports-color
- ts-node
-
[email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])):
- dependencies:
- '@jest/core':
29.7.0([email protected](@types/[email protected])([email protected]))
- '@jest/types': 29.6.3
- import-local: 3.0.2
- jest-cli:
29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))
- transitivePeerDependencies:
- - '@types/node'
- - babel-plugin-macros
- - supports-color
- - ts-node
-
[email protected]: {}
[email protected]: {}
@@ -54750,10 +54646,6 @@ snapshots:
[email protected]: {}
- [email protected]:
- dependencies:
- tslib: 1.14.1
-
[email protected]:
dependencies:
tslib: 2.3.1
@@ -56280,11 +56172,11 @@ snapshots:
babel-jest: 29.7.0(@babel/[email protected])
esbuild: 0.15.13
-
[email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected](@types/[email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected])))([email protected]):
+
[email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected](@types/[email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected])))([email protected]):
dependencies:
bs-logger: 0.2.6
fast-json-stable-stringify: 2.1.0
- jest:
29.7.0(@types/[email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))
+ jest:
29.7.0(@types/[email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))
jest-util: 29.7.0
json5: 2.2.3
lodash.memoize: 4.1.2
@@ -56299,11 +56191,11 @@ snapshots:
babel-jest: 29.7.0(@babel/[email protected])
esbuild: 0.18.20
-
[email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected](@types/[email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected])))([email protected]):
+
[email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected](@types/[email protected])([email protected])([email protected](@types/[email protected])([email protected])))([email protected]):
dependencies:
bs-logger: 0.2.6
fast-json-stable-stringify: 2.1.0
- jest:
29.7.0(@types/[email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))
+ jest:
29.7.0(@types/[email protected])([email protected])([email protected](@types/[email protected])([email protected]))
jest-util: 29.7.0
json5: 2.2.3
lodash.memoize: 4.1.2
@@ -56317,11 +56209,11 @@ snapshots:
'@jest/types': 29.6.3
babel-jest: 29.7.0(@babel/[email protected])
-
[email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected](@types/[email protected])([email protected])([email protected](@types/[email protected])([email protected])))([email protected]):
+
[email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected](@types/[email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected])))([email protected]):
dependencies:
bs-logger: 0.2.6
fast-json-stable-stringify: 2.1.0
- jest:
29.7.0(@types/[email protected])([email protected])([email protected](@types/[email protected])([email protected]))
+ jest:
29.7.0(@types/[email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))
jest-util: 29.7.0
json5: 2.2.3
lodash.memoize: 4.1.2
@@ -56335,11 +56227,11 @@ snapshots:
'@jest/types': 29.6.3
babel-jest: 29.7.0(@babel/[email protected])
-
[email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]):
+
[email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected](@types/[email protected])([email protected])([email protected](@types/[email protected])([email protected])))([email protected]):
dependencies:
bs-logger: 0.2.6
fast-json-stable-stringify: 2.1.0
- jest:
29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))
+ jest:
29.7.0(@types/[email protected])([email protected])([email protected](@types/[email protected])([email protected]))
jest-util: 29.7.0
json5: 2.2.3
lodash.memoize: 4.1.2
diff --git a/repo/graph.dot b/repo/graph.dot
index 0ddae736b2b..3ecfb0097fb 100644
--- a/repo/graph.dot
+++ b/repo/graph.dot
@@ -445,11 +445,17 @@ digraph G {
"@kie-tools/kie-sandbox-webapp-image" -> "@kie-tools/image-builder" [ style
= "dashed", color = "black" ];
"@kie-tools/kn-plugin-workflow" -> "@kie-tools/sonataflow-operator" [ style
= "dashed", color = "black" ];
"@kie/kogito-base-builder-image" -> "@kie-tools/sonataflow-image-common" [
style = "dashed", color = "black" ];
+ "@kie/kogito-data-index-ephemeral-image" -> "@kie-tools/maven-base" [ style
= "dashed", color = "black" ];
"@kie/kogito-data-index-ephemeral-image" ->
"@kie-tools/sonataflow-image-common" [ style = "dashed", color = "black" ];
+ "@kie/kogito-data-index-postgresql-image" -> "@kie-tools/maven-base" [ style
= "dashed", color = "black" ];
"@kie/kogito-data-index-postgresql-image" ->
"@kie-tools/sonataflow-image-common" [ style = "dashed", color = "black" ];
+ "@kie/kogito-jit-runner-image" -> "@kie-tools/maven-base" [ style =
"dashed", color = "black" ];
"@kie/kogito-jit-runner-image" -> "@kie-tools/sonataflow-image-common" [
style = "dashed", color = "black" ];
+ "@kie/kogito-jobs-service-allinone-image" -> "@kie-tools/maven-base" [ style
= "dashed", color = "black" ];
"@kie/kogito-jobs-service-allinone-image" ->
"@kie-tools/sonataflow-image-common" [ style = "dashed", color = "black" ];
+ "@kie/kogito-jobs-service-ephemeral-image" -> "@kie-tools/maven-base" [
style = "dashed", color = "black" ];
"@kie/kogito-jobs-service-ephemeral-image" ->
"@kie-tools/sonataflow-image-common" [ style = "dashed", color = "black" ];
+ "@kie/kogito-jobs-service-postgresql-image" -> "@kie-tools/maven-base" [
style = "dashed", color = "black" ];
"@kie/kogito-jobs-service-postgresql-image" ->
"@kie-tools/sonataflow-image-common" [ style = "dashed", color = "black" ];
"@kie-tools/kogito-management-console" -> "@kie-tools/image-builder" [ style
= "dashed", color = "black" ];
"@kie-tools/kogito-management-console" -> "@kie-tools/image-env-to-json" [
style = "dashed", color = "black" ];
diff --git a/repo/graph.json b/repo/graph.json
index f5b94a13645..2cdd586225a 100644
--- a/repo/graph.json
+++ b/repo/graph.json
@@ -1955,21 +1955,41 @@
"target": "@kie-tools/sonataflow-quarkus-devui",
"weight": 1
},
+ {
+ "source": "@kie/kogito-data-index-ephemeral-image",
+ "target": "@kie-tools/maven-base",
+ "weight": 1
+ },
{
"source": "@kie/kogito-data-index-ephemeral-image",
"target": "@kie-tools/sonataflow-image-common",
"weight": 1
},
+ {
+ "source": "@kie/kogito-data-index-postgresql-image",
+ "target": "@kie-tools/maven-base",
+ "weight": 1
+ },
{
"source": "@kie/kogito-data-index-postgresql-image",
"target": "@kie-tools/sonataflow-image-common",
"weight": 1
},
+ {
+ "source": "@kie/kogito-jobs-service-ephemeral-image",
+ "target": "@kie-tools/maven-base",
+ "weight": 1
+ },
{
"source": "@kie/kogito-jobs-service-ephemeral-image",
"target": "@kie-tools/sonataflow-image-common",
"weight": 1
},
+ {
+ "source": "@kie/kogito-jobs-service-postgresql-image",
+ "target": "@kie-tools/maven-base",
+ "weight": 1
+ },
{
"source": "@kie/kogito-jobs-service-postgresql-image",
"target": "@kie-tools/sonataflow-image-common",
@@ -1990,11 +2010,21 @@
"target": "@kie-tools/root-env",
"weight": 1
},
+ {
+ "source": "@kie/kogito-jit-runner-image",
+ "target": "@kie-tools/maven-base",
+ "weight": 1
+ },
{
"source": "@kie/kogito-jit-runner-image",
"target": "@kie-tools/sonataflow-image-common",
"weight": 1
},
+ {
+ "source": "@kie/kogito-jobs-service-allinone-image",
+ "target": "@kie-tools/maven-base",
+ "weight": 1
+ },
{
"source": "@kie/kogito-jobs-service-allinone-image",
"target": "@kie-tools/sonataflow-image-common",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]